Merge remote-tracking branch 'odoo/7.0' into 7.0
authorOCA git bot <OCA-git-bot@therp.nl>
Wed, 5 Nov 2014 22:42:40 +0000 (23:42 +0100)
committerOCA git bot <OCA-git-bot@therp.nl>
Wed, 5 Nov 2014 22:42:40 +0000 (23:42 +0100)
commit4b07b1435a9a1bc71493e62cd91789c529c65aa3
tree2bc8746ce33772860a7793e4d191618338a2dc26
parent3e1d5be951fb80a958a5c61b0d41e874df261105
parent3e3e35ed7e95ab9d463bddab4a551dfceaded58f
Merge remote-tracking branch 'odoo/7.0' into 7.0
addons/mrp/mrp.py
addons/web/static/src/css/base.css
addons/web/static/src/css/base.sass
addons/web/static/src/js/view_form.js
openerp/tools/translate.py