[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)
commite0ea72388fa408b1a2c7d077539cb1564b973121
treef6cd2e02d27dfba920d663ead2cc718a54262490
parent7ef0d94d6ebc324cab88af8dc5c18c6a3e7062a3
parent4118f9ed0a1e12d4315865723429f056534a98d3
[MERGE] Sync with trunk