[MERGE] from trunk
authorFrédéric van der Essen <fva@openerp.com>
Mon, 28 Apr 2014 09:53:20 +0000 (11:53 +0200)
committerFrédéric van der Essen <fva@openerp.com>
Mon, 28 Apr 2014 09:53:20 +0000 (11:53 +0200)
commite98da6393d0ed57ca0a0dc8c2ff44113c500756f
treeb97e695411ea32eac48d6214fe9126e1cbb07e4f
parenta57f44393d9b8f7eb1613cec3c9513e9bc960c75
parentc236ed817577ce53745cb89dd2229c2f51d5e9e6
[MERGE] from trunk

bzr revid: fva@openerp.com-20140428095320-cm0phsplaoanv566