[Merge]with trunk

author Barad Mahendra <mba@tinyerp.com>

Tue, 15 Apr 2014 09:31:06 +0000 (15:01 +0530)

committer Barad Mahendra <mba@tinyerp.com>

Tue, 15 Apr 2014 09:31:06 +0000 (15:01 +0530)
author Barad Mahendra <mba@tinyerp.com>
Tue, 15 Apr 2014 09:31:06 +0000 (15:01 +0530)
committer Barad Mahendra <mba@tinyerp.com>
Tue, 15 Apr 2014 09:31:06 +0000 (15:01 +0530)
diff --cc addons/web/static/src/css/base.css
Simple merge
diff --cc addons/web/static/src/css/base.sass
Simple merge
diff --cc addons/web/static/src/js/view_form.js
Simple merge
diff --cc addons/web/static/src/xml/base.xml
Simple merge
diff --cc addons/web_kanban/static/src/js/kanban.js
Simple merge
author	Barad Mahendra <mba@tinyerp.com>
	Tue, 15 Apr 2014 09:31:06 +0000 (15:01 +0530)
committer	Barad Mahendra <mba@tinyerp.com>
	Tue, 15 Apr 2014 09:31:06 +0000 (15:01 +0530)
		1	2
addons/web/static/src/css/base.css	patch \|	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/css/base.sass	patch \|	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/view_form.js	patch \|	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/xml/base.xml	patch \|	diff1 \|	diff2 \|	blob \| history
addons/web_kanban/static/src/js/kanban.js	patch \|	diff1 \|	diff2 \|	blob \| history