[MERGE] Sync with trunk
authorThibault Delavallée <tde@openerp.com>
Wed, 16 Apr 2014 11:17:21 +0000 (13:17 +0200)
committerThibault Delavallée <tde@openerp.com>
Wed, 16 Apr 2014 11:17:21 +0000 (13:17 +0200)
commit2fdc1d1905d1ec6e31abad0d4e10424b71a4acc1
tree52cbd07912ea31226bc4db2c2b3019e42d45dbdc
parentd264cd164017795cee3a8b463eee318c7dc61552
parentca8b6cc70348d422e773019e23911f7704c445a7
[MERGE] Sync with trunk

bzr revid: tde@openerp.com-20140416111721-g2vw6140a3adhk6y