[MERGE] from trunk
authorFrédéric van der Essen <fva@openerp.com>
Fri, 11 Apr 2014 12:06:36 +0000 (14:06 +0200)
committerFrédéric van der Essen <fva@openerp.com>
Fri, 11 Apr 2014 12:06:36 +0000 (14:06 +0200)
bzr revid: fva@openerp.com-20140411120636-o6yuuzphfiq33b8j


Trivial merge