[MERGE]
authorNajlaâ <nel@tinyerp.com>
Tue, 31 Jan 2012 11:03:20 +0000 (12:03 +0100)
committerNajlaâ <nel@tinyerp.com>
Tue, 31 Jan 2012 11:03:20 +0000 (12:03 +0100)
bzr revid: nel@tinyerp.com-20120131110320-co4qfoeqaibip3pt

1  2 
addons/account/account.py

Simple merge