[MERGE] Sync with trunk
authorThibault Delavallée <tde@openerp.com>
Fri, 11 Apr 2014 14:59:55 +0000 (16:59 +0200)
committerThibault Delavallée <tde@openerp.com>
Fri, 11 Apr 2014 14:59:55 +0000 (16:59 +0200)
commitaa48312b986c3c2fb542e6dddaae57d4edc17b60
tree540a982546be672aa04f8330739982f480c93bfe
parent926cfb33b2481fe21d16f38d9aa5f4c12846f2a3
parentbf7c16d6d905172d437ac6c154b7cacb1c802605
[MERGE] Sync with trunk

bzr revid: tde@openerp.com-20140411145955-91iohb1enc50se5l