[MERGE] from saas-3
authorFrédéric van der Essen <fva@openerp.com>
Thu, 6 Feb 2014 15:15:27 +0000 (16:15 +0100)
committerFrédéric van der Essen <fva@openerp.com>
Thu, 6 Feb 2014 15:15:27 +0000 (16:15 +0100)
commit34bc74ea422230fd052382e16c0c5e3fcdd26d27
tree03ec5c59f372ea32d35770fd5ebc4bb457ce8f27
parenta78af30755bab161e07330a552e3495b0a751e2e
parent2f682975bce5e6eb12123188b7797d7faf61d7ef
[MERGE] from saas-3

bzr revid: fva@openerp.com-20140206151527-qxb9sxrz1wi7d0xk