[MERGE] from trunk
authorFrédéric van der Essen <fva@openerp.com>
Thu, 20 Mar 2014 13:40:17 +0000 (14:40 +0100)
committerFrédéric van der Essen <fva@openerp.com>
Thu, 20 Mar 2014 13:40:17 +0000 (14:40 +0100)
bzr revid: fva@openerp.com-20140320134017-wi6qdofziia3q12l


Trivial merge