[MERGE] trunk
authorFabien Meghazi <fme@openerp.com>
Wed, 20 Jun 2012 15:08:51 +0000 (17:08 +0200)
committerFabien Meghazi <fme@openerp.com>
Wed, 20 Jun 2012 15:08:51 +0000 (17:08 +0200)
commitd2bfcd85a374f78adea3f64075971cc86d61b2cb
tree70dce16dd27f4c9ff471de27823d1e66bd1b6836
parent63fa49c18d356dd381565a69c206b6156bd8c897
parent590937d49a802f4565daa712f1e0d63c96b0bf6b
[MERGE] trunk

bzr revid: fme@openerp.com-20120620150851-fi18faps8pp64obh
addons/web/static/src/css/base.css
addons/web/static/src/css/base.sass
addons/web/static/src/xml/base.xml
addons/web_kanban/static/src/css/kanban.css
addons/web_kanban/static/src/css/kanban.sass