[MERGE] merged with main trunk
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Fri, 9 Dec 2011 10:58:17 +0000 (11:58 +0100)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Fri, 9 Dec 2011 10:58:17 +0000 (11:58 +0100)
commit4609b7a86b6ce2e02b1887705a26d8f79c92105c
tree0e7dc67e7a8424b913d83a3cbc6ad921b55b4059
parentbe08728a439efcb14da1ae1354bcd7d1c0651173
parentd9fcbf5946ceb13411aa92f3afc13f66adcb2a24
[MERGE] merged with main trunk

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