[MERGE] Sync with trunk
authorOlivier Dony <odo@openerp.com>
Tue, 11 Sep 2012 11:41:04 +0000 (13:41 +0200)
committerOlivier Dony <odo@openerp.com>
Tue, 11 Sep 2012 11:41:04 +0000 (13:41 +0200)
commit9a577ef431950b3d2cc4d5e7ff3cc8bec4ab88f5
treead4b8087d6e439fb0252429acbb652b0554f9adf
parentea714905cc468bab3008adf03c4cef94487f51dc
parente5b0cd2091e53c5e0e08fc94461ebfb1797ce7dd
[MERGE] Sync with trunk

bzr revid: odo@openerp.com-20120911114104-vk8afbjq9ao1dqr2
openerp/addons/base/ir/ir_translation.py
openerp/addons/base/module/module.py
openerp/service/web_services.py
openerp/tests/common.py
openerp/tools/translate.py