[MERGE] Sync with trunk
authorThibault Delavallée <tde@openerp.com>
Fri, 11 Apr 2014 14:09:29 +0000 (16:09 +0200)
committerThibault Delavallée <tde@openerp.com>
Fri, 11 Apr 2014 14:09:29 +0000 (16:09 +0200)
commit2929f2438a92a7001ab09b980052ac186926296e
treed7a5b2bf1f51f8bbca1f586ea2013f5a0cc06599
parent24e5270347bcf4a2d985c4f57e6f87a6363b468d
parent27738154c3fd6a47e02c6a11413b5054cba1093f
[MERGE] Sync with trunk

bzr revid: tde@openerp.com-20140411140929-7w4qo086j991houy