Merge remote-tracking branch 'odoo/7.0' into 7.0
authorOCA git bot <OCA-git-bot@therp.nl>
Mon, 24 Nov 2014 22:42:40 +0000 (23:42 +0100)
committerOCA git bot <OCA-git-bot@therp.nl>
Mon, 24 Nov 2014 22:42:40 +0000 (23:42 +0100)
commitd128b409761835dd40ea5c0b0dbc51adeae3b097
tree4bd4d6000b7a663624db88bf9bbc0234e97a8725
parent4170cd8812047b74fa153c3acd329b942066108a
parent4ce7af357317886cfd7f08e7b1e23c6a56d9f431
Merge remote-tracking branch 'odoo/7.0' into 7.0