[MERGE] from upstream
authorFrédéric van der Essen <fva@openerp.com>
Mon, 24 Feb 2014 13:50:38 +0000 (14:50 +0100)
committerFrédéric van der Essen <fva@openerp.com>
Mon, 24 Feb 2014 13:50:38 +0000 (14:50 +0100)
commit31cb4b8423e8d42083b342c923bd96b91e47465c
treec36bb4392bb95879cf06e367f5ca906dc779ae7f
parentc20c49f3a8d5667a8fc597ce4a305029af499ba4
parent85d3f2ebf507ab26872524dda2365075229acd71
[MERGE] from upstream

bzr revid: fva@openerp.com-20140224135038-3l6p5ebb5klmw8yr