[MERGE]sync with trunk
authorsgo@tinyerp.com <>
Wed, 5 Jun 2013 07:07:37 +0000 (12:37 +0530)
committersgo@tinyerp.com <>
Wed, 5 Jun 2013 07:07:37 +0000 (12:37 +0530)
commitd3c7f6becffc7830f8f4c26b6cef7842d4a8ac4a
tree6a21e7cca54f5eb1fedada25cd4d44bbf2f4c129
parent9f35da63763685c578031dcefe652cc95d8e3dd1
parent5cc8c30adfeccc6db22ebf7487b8e4ebdbe10423
[MERGE]sync with trunk

bzr revid: sgo@tinyerp.com-20130605070737-5sdnhqzysi1lcnnj
addons/account/account.py
addons/account/account_view.xml