[MERGE] Forward-port of latest saas-3 bugfixes, up to rev. 4003 revid:dle@openerp...

author Denis Ledoux <dle@openerp.com>

Fri, 18 Apr 2014 15:14:00 +0000 (17:14 +0200)

committer Denis Ledoux <dle@openerp.com>

Fri, 18 Apr 2014 15:14:00 +0000 (17:14 +0200)
author Denis Ledoux <dle@openerp.com>
Fri, 18 Apr 2014 15:14:00 +0000 (17:14 +0200)
committer Denis Ledoux <dle@openerp.com>
Fri, 18 Apr 2014 15:14:00 +0000 (17:14 +0200)
diff --cc addons/web/controllers/main.py
Simple merge
diff --cc addons/web/static/src/js/view_form.js
Simple merge
diff --cc addons/web_kanban/static/src/css/kanban.css
Simple merge
author	Denis Ledoux <dle@openerp.com>
	Fri, 18 Apr 2014 15:14:00 +0000 (17:14 +0200)
committer	Denis Ledoux <dle@openerp.com>
	Fri, 18 Apr 2014 15:14:00 +0000 (17:14 +0200)
		1	2
addons/web/controllers/main.py	patch \|	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/view_form.js	patch \|	diff1 \|	diff2 \|	blob \| history
addons/web_kanban/static/src/css/kanban.css	patch \|	diff1 \|	diff2 \|	blob \| history