[MERGE] Sync with trunk until revision 4967
authorThibault Delavallée <tde@openerp.com>
Fri, 11 Oct 2013 09:16:05 +0000 (11:16 +0200)
committerThibault Delavallée <tde@openerp.com>
Fri, 11 Oct 2013 09:16:05 +0000 (11:16 +0200)
commitb0d16d0fcc1f90dc33fd03249ebdb0491a8fd764
treee40494cb3f07eac5b406de888d80053c47d70bae
parentdd066f3c29392e0a6f7121ff4d35ed7449a5dfaa
parent8c3f19d9136431f9fe542afdd8f370a772734adb
[MERGE] Sync with trunk until revision 4967

bzr revid: tde@openerp.com-20131011091605-79yhy54spnenf21u