Merge remote-tracking branch 'odoo/7.0' into 7.0
authorOCA git bot <OCA-git-bot@therp.nl>
Thu, 23 Oct 2014 21:42:36 +0000 (23:42 +0200)
committerOCA git bot <OCA-git-bot@therp.nl>
Thu, 23 Oct 2014 21:42:36 +0000 (23:42 +0200)
commitf680fdff6d70980e61f2cefd86e3e0e277aaa7cd
tree788b997cff04fdf6b3861cf467558397a81a600b
parent02e8d1a228e6dd301978246b2a756c5c33f747f3
parent8e76938becb614ab8f763281587d47535309fcb0
Merge remote-tracking branch 'odoo/7.0' into 7.0
addons/web/static/src/css/base.css
addons/web/static/src/css/base.sass