[MERGE] stock,mrp: restore deactivated tests (backport from trunk), courtesy of Lione...
authorOlivier Dony <odo@openerp.com>
Fri, 4 Apr 2014 13:51:45 +0000 (15:51 +0200)
committerOlivier Dony <odo@openerp.com>
Fri, 4 Apr 2014 13:51:45 +0000 (15:51 +0200)
lp bug: https://launchpad.net/bugs/1182515 fixed

bzr revid: odo@openerp.com-20140404135145-t8b0m2ijcq3y8sh6


Trivial merge