[MERGE] lp:~openerp-dev/openobject-addons/trunk-module_description_review-stw
authorStephane Wirtel <stw@openerp.com>
Wed, 25 Jul 2012 09:48:48 +0000 (11:48 +0200)
committerStephane Wirtel <stw@openerp.com>
Wed, 25 Jul 2012 09:48:48 +0000 (11:48 +0200)
commitb814c3f7721dcab10cb1078499c7fd318e0330c4
tree5fe240d94dcaaca69098fc026ad46aa52e2383a3
parent7be304e642c670f7a8b15ef902470d7be773e503
parent9f299d9a204a06aa703c5abeddd233634bbc48b7
[MERGE] lp:~openerp-dev/openobject-addons/trunk-module_description_review-stw

bzr revid: stw@openerp.com-20120725094848-ztd2t2a79q9xqdnz
addons/l10n_in/__openerp__.py
addons/product/__openerp__.py