[MERGE]: Merge with lp:openobject-addons
authorAtik Agewan (OpenERP) <aag@tinyerp.com>
Thu, 15 Sep 2011 12:08:26 +0000 (17:38 +0530)
committerAtik Agewan (OpenERP) <aag@tinyerp.com>
Thu, 15 Sep 2011 12:08:26 +0000 (17:38 +0530)
bzr revid: aag@tinyerp.com-20110915120826-mad8bn7elwu5qdr0

1  2 
addons/stock/stock.py

Simple merge