[MERGE] forward port of branch 7.0 up to 5872c24
authorDenis Ledoux <dle@odoo.com>
Thu, 4 Sep 2014 10:31:14 +0000 (12:31 +0200)
committerDenis Ledoux <dle@odoo.com>
Thu, 4 Sep 2014 10:31:14 +0000 (12:31 +0200)
commita587e1bc17de78def9319c7bfbbd8ac871b51722
tree4402b63ae3310e94682d301710d3d3a3d5306225
parente1e928ef86d8dafde82538002a6799075cb69371
parent5872c2485d8351b6e0569009b4828448fed69622
[MERGE] forward port of branch 7.0 up to 5872c24