Merge branch '8.0' of https://github.com/odoo/odoo into odoo/8.0
authorJosse Colpaert <jco@odoo.com>
Mon, 7 Jul 2014 21:34:12 +0000 (23:34 +0200)
committerJosse Colpaert <jco@odoo.com>
Mon, 7 Jul 2014 21:34:12 +0000 (23:34 +0200)
commite309159eb134bf65e2a091bcca482a9b4e5acddb
tree8c0b92559fb32c4c4cf8e9a90e5c6c6734cafcaf
parent7f9d1f42bf3ad7a734ed5f317bbb4a8a9df639c5
parente9fae40faf742a0d2f89b0e01d7feb559aa142f7
Merge branch '8.0' of https://github.com/odoo/odoo into odoo/8.0