[MERGE] from trunk
authorFrédéric van der Essen <fva@openerp.com>
Wed, 29 Jan 2014 16:18:02 +0000 (17:18 +0100)
committerFrédéric van der Essen <fva@openerp.com>
Wed, 29 Jan 2014 16:18:02 +0000 (17:18 +0100)
commit83196be65ea4d9688d6819d9dc54bdc60d77cb18
treeee43d26b817950f7233dffae8581d9366e033ffa
parent4e73dce8d33e29501e4b7fe81d2920be07b2d903
parent9860ddd352d4ca6a60123709f2f97026e1ae7413
[MERGE] from trunk

bzr revid: fva@openerp.com-20140129161802-14patbv206pqj68j