[MERGE] Sync with trunk, to have last fixes
authorThibault Delavallée <tde@openerp.com>
Tue, 8 Apr 2014 15:12:53 +0000 (17:12 +0200)
committerThibault Delavallée <tde@openerp.com>
Tue, 8 Apr 2014 15:12:53 +0000 (17:12 +0200)
commit759431c6d61fb7ef8bf84a1b3769788ac5c44b3f
tree07418bb8eb35f0ec630cb3a2fbd34d1d3b1ad2b0
parent6c6885d7fa97483928839c40b9114fe15db48fcf
parent5174b25fcef72ce3e998cd986f64039ee7f33187
[MERGE] Sync with trunk, to have last fixes

bzr revid: tde@openerp.com-20140408151253-sabtrlt79uj31stw