[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)
bzr revid: tde@openerp.com-20131011091605-79yhy54spnenf21u


Trivial merge