[MERGE]
authorOlivier Laurent <olt@tinyerp.com>
Tue, 3 Feb 2009 15:12:34 +0000 (16:12 +0100)
committerOlivier Laurent <olt@tinyerp.com>
Tue, 3 Feb 2009 15:12:34 +0000 (16:12 +0100)
bzr revid: olt@tinyerp.com-20090203151234-fsreb9235019z0gk

1  2 
addons/account_report/__terp__.py
addons/base_iban/__terp__.py

Simple merge
Simple merge