[MERGE] from trunk
authorFrédéric van der Essen <fva@openerp.com>
Fri, 23 Nov 2012 13:58:18 +0000 (14:58 +0100)
committerFrédéric van der Essen <fva@openerp.com>
Fri, 23 Nov 2012 13:58:18 +0000 (14:58 +0100)
commit34fe9707871d946ccd450eed37de680c4a78fef5
treebc6933e611efed3f131aaece9ad106402e21ba4f
parenta0e96bfa47142e347a9fe92aea33ebd320af5561
parentb77d7d20ae569fd17d0a7c79c316f379943d6cb4
[MERGE] from trunk

bzr revid: fva@openerp.com-20121123135818-ffawdp1f7nzxphop
addons/web/static/src/css/base.css
addons/web/static/src/css/base.sass