[MERGE]
authorChristophe Simonis <chs@tinyerp.com>
Fri, 5 Feb 2010 15:28:37 +0000 (16:28 +0100)
committerChristophe Simonis <chs@tinyerp.com>
Fri, 5 Feb 2010 15:28:37 +0000 (16:28 +0100)
bzr revid: chs@tinyerp.com-20100205152837-539yy3vedgqreyvc

1  2 
addons/account/account.py
addons/account/account_view.xml
addons/sale/sale_view.xml

Simple merge
Simple merge
Simple merge