[MERGE]
authorHarry (OpenERP) <hmo@tinyerp.com>
Thu, 9 Aug 2012 13:06:39 +0000 (18:36 +0530)
committerHarry (OpenERP) <hmo@tinyerp.com>
Thu, 9 Aug 2012 13:06:39 +0000 (18:36 +0530)
bzr revid: hmo@tinyerp.com-20120809130639-vykbp1cqi02y66ct

1  2 
addons/account/account.py

Simple merge