[MERGE] Sync with trunk
authorThibault Delavallée <tde@openerp.com>
Tue, 13 May 2014 08:56:28 +0000 (10:56 +0200)
committerThibault Delavallée <tde@openerp.com>
Tue, 13 May 2014 08:56:28 +0000 (10:56 +0200)

Trivial merge