Merge remote-tracking branch 'odoo/7.0' into 7.0
authorOCA git bot <OCA-git-bot@therp.nl>
Fri, 10 Oct 2014 21:42:34 +0000 (23:42 +0200)
committerOCA git bot <OCA-git-bot@therp.nl>
Fri, 10 Oct 2014 21:42:34 +0000 (23:42 +0200)
commit32f0f456e93ac52b0594616f073d91198c227526
treebf99be580ff3819db1722953ce780260c4054bef
parentc154a2ad8d4920f636cd4b1beb00ef15a66456ac
parent1b49a876196de1f4b6568ff1751f7c7c6b2d5002
Merge remote-tracking branch 'odoo/7.0' into 7.0