[MERGE] from trunk
authorFrédéric van der Essen <fva@openerp.com>
Mon, 28 Apr 2014 15:29:38 +0000 (17:29 +0200)
committerFrédéric van der Essen <fva@openerp.com>
Mon, 28 Apr 2014 15:29:38 +0000 (17:29 +0200)
bzr revid: fva@openerp.com-20140428152938-ib1yl6f7lgat51vm


Trivial merge