Merge remote-tracking branch 'odoo/7.0' into 7.0
authorOCA git bot <OCA-git-bot@therp.nl>
Thu, 6 Nov 2014 22:42:38 +0000 (23:42 +0100)
committerOCA git bot <OCA-git-bot@therp.nl>
Thu, 6 Nov 2014 22:42:38 +0000 (23:42 +0100)
commit9ecdbc5626311e85dd1371dfee2fa80e91defe20
tree8532872ff75870d3973690276fa0ae53da80000d
parent4b07b1435a9a1bc71493e62cd91789c529c65aa3
parentc6a5be0a195c71c7ded9cc863815d115259abfd9
Merge remote-tracking branch 'odoo/7.0' into 7.0
addons/account_asset/account_asset.py
addons/web/static/src/js/view_form.js