Merge with latest code..

author Jignesh Rathod (OpenERP) <jir@tinyerp.com>

Fri, 7 Jun 2013 05:49:34 +0000 (11:19 +0530)

committer Jignesh Rathod (OpenERP) <jir@tinyerp.com>

Fri, 7 Jun 2013 05:49:34 +0000 (11:19 +0530)
author Jignesh Rathod (OpenERP) <jir@tinyerp.com>
Fri, 7 Jun 2013 05:49:34 +0000 (11:19 +0530)
committer Jignesh Rathod (OpenERP) <jir@tinyerp.com>
Fri, 7 Jun 2013 05:49:34 +0000 (11:19 +0530)
diff --cc addons/web/static/src/css/base.css
Simple merge
diff --cc addons/web/static/src/js/view_form.js
Simple merge
diff --cc addons/web/static/src/js/view_list.js
Simple merge
diff --cc addons/web_kanban/static/src/js/kanban.js
Simple merge
author	Jignesh Rathod (OpenERP) <jir@tinyerp.com>
	Fri, 7 Jun 2013 05:49:34 +0000 (11:19 +0530)
committer	Jignesh Rathod (OpenERP) <jir@tinyerp.com>
	Fri, 7 Jun 2013 05:49:34 +0000 (11:19 +0530)
		1	2
addons/web/static/src/css/base.css	patch \|	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/view_form.js	patch \|	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/view_list.js	patch \|	diff1 \|	diff2 \|	blob \| history
addons/web_kanban/static/src/js/kanban.js	patch \|	diff1 \|	diff2 \|	blob \| history