[MERGE] from trunk
authorFrédéric van der Essen <fva@openerp.com>
Wed, 29 Jan 2014 13:21:34 +0000 (14:21 +0100)
committerFrédéric van der Essen <fva@openerp.com>
Wed, 29 Jan 2014 13:21:34 +0000 (14:21 +0100)
commitdff17307e277dffc7635238568ad052534cd3a84
tree804be3938fa8380619a8ed27d2cd9570cc57d0b0
parent9d85d0c25f01a14af177b9046a5795991a8c04a1
parentda020d326d7858fd7914c58ed26a729c1c02c9a3
[MERGE] from trunk

bzr revid: fva@openerp.com-20140129132134-vw0hwk1573ippjyz