Merge remote-tracking branch 'odoo/7.0' into 7.0
authorOCA git bot <OCA-git-bot@therp.nl>
Tue, 18 Nov 2014 22:42:42 +0000 (23:42 +0100)
committerOCA git bot <OCA-git-bot@therp.nl>
Tue, 18 Nov 2014 22:42:42 +0000 (23:42 +0100)
commite5ece8625d02733b1710e0abba2910e9da5aee9b
treee872fe370ff5cae1d14d3118fde2eb8e9daad93c
parent45e0aef8b7f43875affa5a646423dbdfa0b3d851
parentbb7a9dea8b401f66ab6f4f241f21ecc4123b6b97
Merge remote-tracking branch 'odoo/7.0' into 7.0