[MERGE] from trunk
authorFrédéric van der Essen <fva@openerp.com>
Mon, 27 Jan 2014 13:29:25 +0000 (14:29 +0100)
committerFrédéric van der Essen <fva@openerp.com>
Mon, 27 Jan 2014 13:29:25 +0000 (14:29 +0100)
commit9d85d0c25f01a14af177b9046a5795991a8c04a1
tree4a21991b84e2d1370882c75675a479a917147cb7
parent85daaccb619c2da8e3f05b72468d99bf24e060fc
parent5237dc9574be436182adc186d1846f1420f5dee7
[MERGE] from trunk

bzr revid: fva@openerp.com-20140127130136-905xxex6cfsbfwjs
bzr revid: fva@openerp.com-20140127132925-9bvrpfaaxp17pq58