Merge remote-tracking branch 'odoo/7.0' into 7.0
authorOCA git bot <OCA-git-bot@therp.nl>
Thu, 13 Nov 2014 22:42:44 +0000 (23:42 +0100)
committerOCA git bot <OCA-git-bot@therp.nl>
Thu, 13 Nov 2014 22:42:44 +0000 (23:42 +0100)
1  2 
addons/account/account.py

Simple merge