[MERGE] lp:777121
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Mon, 30 May 2011 16:21:43 +0000 (18:21 +0200)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Mon, 30 May 2011 16:21:43 +0000 (18:21 +0200)
bzr revid: qdp-launchpad@openerp.com-20110530162143-0jkl2zvcmnaw63av

1  2 
addons/stock/stock.py

Simple merge