Merge remote-tracking branch 'odoo/7.0' into 7.0
authorOCA git bot <OCA-git-bot@therp.nl>
Wed, 5 Nov 2014 09:37:15 +0000 (10:37 +0100)
committerOCA git bot <OCA-git-bot@therp.nl>
Wed, 5 Nov 2014 09:37:15 +0000 (10:37 +0100)
commit3e1d5be951fb80a958a5c61b0d41e874df261105
tree6dd590f1c5198bea89d26c6b1ab1e3491a422277
parentfb978c605e02518e0989af48101cd51d85ffeeaa
parentbe7c894cfd4940004f694ed66beefd45f8e98c0f
Merge remote-tracking branch 'odoo/7.0' into 7.0

Conflicts:
addons/account/account_invoice.py
addons/account/account_invoice.py
addons/web/static/src/js/views.js
addons/web_kanban/static/src/js/kanban.js