[MERGE] merge from trunk into local branch
authorGery Debongnie <ged@openerp.com>
Mon, 10 Feb 2014 08:30:32 +0000 (09:30 +0100)
committerGery Debongnie <ged@openerp.com>
Mon, 10 Feb 2014 08:30:32 +0000 (09:30 +0100)
bzr revid: ged@openerp.com-20140210083032-tjya291i9y2o4bq5


Trivial merge