[MERGE] merge from master
authorGéry Debongnie <ged@odoo.com>
Fri, 30 May 2014 18:21:03 +0000 (20:21 +0200)
committerGéry Debongnie <ged@odoo.com>
Fri, 30 May 2014 18:21:03 +0000 (20:21 +0200)
commit52a8c4cf9aabf024cbfd1355d319fc160738c876
tree0a08bb77a7f65e04fd95a80469949c80055dbbaa
parent907546eaf438cc459c4b4a1f0c94ebd945462d55
parent52b799d8d07d738dd61a93ae7fd15652b2b020d4
[MERGE] merge from master
addons/account_analytic_analysis/account_analytic_analysis_view.xml
addons/event/event_view.xml
addons/stock/stock_view.xml
addons/web/static/src/css/base.css
addons/web/static/src/css/base.sass
addons/web/static/src/xml/base.xml