[MERGE] with addons-trunk and resolve conflict in base_iban
authorAlexis de Lattre <alexis@via.ecp.fr>
Tue, 31 Jan 2012 13:36:57 +0000 (14:36 +0100)
committerAlexis de Lattre <alexis@via.ecp.fr>
Tue, 31 Jan 2012 13:36:57 +0000 (14:36 +0100)
commitc646827762174c5a1ca7a22c35a7178d3a9e9ef6
tree29f0c87f4965504c8bdad9cea526fee84d13d77d
parente29721f8727187fd8eb9060bdaabee0450b0b4fd
parenteea68d698186b47f39ae6df2565971bd3762ffdf
[MERGE] with addons-trunk and resolve conflict in base_iban
<> changed to !=
Changed error message

bzr revid: alexis@via.ecp.fr-20120131133657-0gzkk0bcb709ca6f
addons/base_iban/base_iban.py
addons/l10n_fr_rib/__openerp__.py
addons/l10n_fr_rib/bank.py