[MERGE] from chm
authorFrédéric van der Essen <fva@openerp.com>
Mon, 29 Oct 2012 10:44:51 +0000 (11:44 +0100)
committerFrédéric van der Essen <fva@openerp.com>
Mon, 29 Oct 2012 10:44:51 +0000 (11:44 +0100)
commita754a323eb8458d4bf995af478e5a6287a3ef8ec
tree4b7d1f8e1eefa8919a9de629b187c665524b507e
parent4b6165f55601f918ff6c03d52487998417f86595
parenta2d3d1df80c044ed62a02e47d7dca242b385992d
[MERGE] from chm

bzr revid: fva@openerp.com-20121029104451-i3r2jb89gcipkqa4