[MERGE] lp:909014
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Thu, 29 Dec 2011 17:14:53 +0000 (18:14 +0100)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Thu, 29 Dec 2011 17:14:53 +0000 (18:14 +0100)
bzr revid: qdp-launchpad@openerp.com-20111229171453-p8pg8dxkrf49lkzw

1  2 
addons/account/account.py

Simple merge