[MERGE] from trunk
authorFrédéric van der Essen <fva@openerp.com>
Fri, 11 Apr 2014 12:06:36 +0000 (14:06 +0200)
committerFrédéric van der Essen <fva@openerp.com>
Fri, 11 Apr 2014 12:06:36 +0000 (14:06 +0200)
commit57c636fb7a51fa5321a5dbf55ec145f390ed4015
tree8c9dc44712535309b1368f1bef7e5054b70ecb86
parentd704fb0060659b97912a4c129d461a2549e1bf3d
parent511cf0270cf63e860826b6b31abd4b3eef594170
[MERGE] from trunk

bzr revid: fva@openerp.com-20140411120636-o6yuuzphfiq33b8j