[MERGE] merged with main addons trunk
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Fri, 9 Dec 2011 08:19:05 +0000 (09:19 +0100)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Fri, 9 Dec 2011 08:19:05 +0000 (09:19 +0100)
commit6b2dd13e96dcbfa0e0431c93561b12a040331635
tree52fdbc624d5e0c28d60e0f1e8919841ad3119fa1
parentaefa500ca9a33e17dc2b76fcf091658c960241e5
parent59b89d88fd3622b4f3f228cde83734ad6861e3c1
[MERGE] merged with main addons trunk

bzr revid: qdp-launchpad@openerp.com-20111209081905-pq3nm1un3hgiavvz
addons/account/__openerp__.py
addons/account/account.py
addons/account/account_view.xml