[MERGE] forward port of branch 7.0 up to revid 5281 launchpad_translations_on_behalf_...
authorChristophe Simonis <chs@openerp.com>
Tue, 15 Apr 2014 13:36:50 +0000 (15:36 +0200)
committerChristophe Simonis <chs@openerp.com>
Tue, 15 Apr 2014 13:36:50 +0000 (15:36 +0200)
commit3d2e9b4d2b6647016268ca3b5f7dd5c523a4fbb6
tree8014712ec2ae83aa443eebca36fe253249ef6173
parentf8d5ef0f80c216abd2e810edd4b9761c69c36dad
parent001a034e587624e0bcca88b55d8cb5a580bec3a1
[MERGE] forward port of branch 7.0 up to revid 5281 launchpad_translations_on_behalf_of_openerp-20140412094159-mhy3v2prb3ctx32k

bzr revid: jke@openerp.com-20140409153527-mic1a8afcvdhsd27
bzr revid: chs@openerp.com-20140410102422-fcwxhjk40z0oy8x5
bzr revid: chs@openerp.com-20140415133650-y46i0o3qkb2atbvi
openerp/addons/base/module/module.py
openerp/addons/base/static/src/js/apps.js
openerp/osv/expression.py
openerp/sql_db.py
openerp/tools/safe_eval.py
setup.py