[Merge]with: lp:openobject-addons
authorDBR (OpenERP) <dbr@tinyerp.com>
Tue, 29 Nov 2011 07:02:53 +0000 (12:32 +0530)
committerDBR (OpenERP) <dbr@tinyerp.com>
Tue, 29 Nov 2011 07:02:53 +0000 (12:32 +0530)
commit28e78e8348a1f010378476d151768ea0832f72d6
tree3307c279199ab7f6b2c07eb2df4b2009714993dc
parent68e863c3fdefb2bdab583f7e0e082e86e88cdeb5
parentaaec013f9ebb284244ebd877493f13aafe2b5c56
[Merge]with: lp:openobject-addons

bzr revid: dbr@tinyerp.com-20111129070253-rxvua0knwe90yjq1
addons/stock/__openerp__.py