Merge remote-tracking branch 'odoo/7.0' into 7.0
authorOCA git bot <OCA-git-bot@therp.nl>
Thu, 25 Sep 2014 21:42:30 +0000 (23:42 +0200)
committerOCA git bot <OCA-git-bot@therp.nl>
Thu, 25 Sep 2014 21:42:30 +0000 (23:42 +0200)
commita32fe04bc555f69f53a83bd73de82c277cb4beec
treea78456db7eb69618f44b52c7f31986a93defa866
parent7be556d3b46e9ded272b83de09ec94a3a935ca8c
parent074c7b6c2516a3c6bd761808edb01be2fbba19bf
Merge remote-tracking branch 'odoo/7.0' into 7.0