[MERGE] forward port of branch saas-3 up to revid 5116 chs@openerp.com-20140415133650...
authorChristophe Simonis <chs@openerp.com>
Tue, 15 Apr 2014 14:05:48 +0000 (16:05 +0200)
committerChristophe Simonis <chs@openerp.com>
Tue, 15 Apr 2014 14:05:48 +0000 (16:05 +0200)
commit863e295937b1590195e8b71ca0cbdb0693e43075
tree878059640532821bc70d51e127e84d4a07a09615
parent1c5ed2973e12c602477d583662761d13c5e8070e
parent3d2e9b4d2b6647016268ca3b5f7dd5c523a4fbb6
[MERGE] forward port of branch saas-3 up to revid 5116 chs@openerp.com-20140415133650-y46i0o3qkb2atbvi

bzr revid: chs@openerp.com-20140415140548-rlg9uypv78pywqhc
setup.py