[MERGE] MergeD lp:openobject-addons.
authorParamjit Singh Sahota <psa@tinyerp.com>
Fri, 7 Jun 2013 13:16:51 +0000 (18:46 +0530)
committerParamjit Singh Sahota <psa@tinyerp.com>
Fri, 7 Jun 2013 13:16:51 +0000 (18:46 +0530)
bzr revid: psa@tinyerp.com-20130607131651-ra85hgmf6ivmsq2i

1  2 
addons/account/account.py

Simple merge