[MERGE]Trunk.
authorVidhin Mehta (OpenERP) <vme@tinyerp.com>
Thu, 13 Dec 2012 12:36:54 +0000 (18:06 +0530)
committerVidhin Mehta (OpenERP) <vme@tinyerp.com>
Thu, 13 Dec 2012 12:36:54 +0000 (18:06 +0530)
commitee4d3ed5bb690298e527d0afb6433a34a3125447
tree83d79e6041081c4c451144fc33a6d1848e6d8085
parent91d701679c8c459d5004ff4d0d892661df2e3851
parent96231a7ddbd228cbc8e27040c974771e84d57d49
[MERGE]Trunk.

bzr revid: vme@tinyerp.com-20121213123654-q62x4vdig4tkdton
addons/web/static/src/css/base.css
addons/web/static/src/css/base.sass