[MERGE] from upstream
authorFrédéric van der Essen <fva@openerp.com>
Mon, 24 Feb 2014 16:09:09 +0000 (17:09 +0100)
committerFrédéric van der Essen <fva@openerp.com>
Mon, 24 Feb 2014 16:09:09 +0000 (17:09 +0100)
commitc1d5d858eb462a3d106dfb3f634895d16e261561
tree7b0d9b7a8164b95de9b68b0bd86203da6684539e
parent3d4f063e519d5c7255aec6f268df89f21bcd62a6
parent055f73322d94ceff3299875d08a7d0cdbf754719
[MERGE] from upstream

bzr revid: fva@openerp.com-20140224160909-ezk3re38imtq2eo1