[MERGE] Merged trunk.
authorJiten (OpenERP) <jra@tinyerp.com>
Thu, 25 Oct 2012 09:35:37 +0000 (15:05 +0530)
committerJiten (OpenERP) <jra@tinyerp.com>
Thu, 25 Oct 2012 09:35:37 +0000 (15:05 +0530)
commit2354633823bbf111763b239fed0b9579e977de3f
treef5c4e921ee8b5b14f00b3f2a49ed30828cadd48d
parent20b72ad1929401f60cf545f60964062b10fe6e08
parentd6fc9033e2c47a2e969148ef14bf0a1d81020db5
[MERGE] Merged trunk.

bzr revid: jra@tinyerp.com-20121025093537-rua2i3iqg2wisa5v
addons/web/static/src/css/base.css
addons/web/static/src/css/base.sass