[MERGE] from saas-3
authorFrédéric van der Essen <fva@openerp.com>
Fri, 7 Feb 2014 15:50:55 +0000 (16:50 +0100)
committerFrédéric van der Essen <fva@openerp.com>
Fri, 7 Feb 2014 15:50:55 +0000 (16:50 +0100)
commit4232de7bf2f19fd01fc9dcccf421eaeba819e586
tree5ee2ab75842426634cd0bbc24ed201ae8f08729d
parent34bc74ea422230fd052382e16c0c5e3fcdd26d27
parentc254b7ae2cee1a240380880d76f10aeb715a5b37
[MERGE] from saas-3

bzr revid: fva@openerp.com-20140207155055-3z8o3fvx2zkoqe91