[MERGE] lp:700928
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Fri, 25 Mar 2011 13:56:09 +0000 (14:56 +0100)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Fri, 25 Mar 2011 13:56:09 +0000 (14:56 +0100)
bzr revid: qdp-launchpad@openerp.com-20110325135609-rscqyc12e17mbasx

1  2 
addons/stock/stock.py

Simple merge