[MERGE] merged with main trunk
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Mon, 5 Dec 2011 15:08:19 +0000 (16:08 +0100)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Mon, 5 Dec 2011 15:08:19 +0000 (16:08 +0100)
commitbd724f43b4ce6eff3c12a31d3c0ae36a3277ecd4
treebc875ff875300cf542c46a8bea0d5be87a9786cc
parenta0f8272bf895194eabb9818ae52ca0141c7e851f
parent20c2ebf9cc1f4afc7d3e6494626f3fd82f6bd351
[MERGE] merged with main trunk

bzr revid: qdp-launchpad@openerp.com-20111205150819-tuzcw6v25wp2aq9r
addons/account/__openerp__.py
addons/account/account.py