[MERGE] Sync with trunk

author Thibault Delavallée <tde@openerp.com>

Thu, 16 Jan 2014 11:01:02 +0000 (12:01 +0100)

committer Thibault Delavallée <tde@openerp.com>

Thu, 16 Jan 2014 11:01:02 +0000 (12:01 +0100)
author Thibault Delavallée <tde@openerp.com>
Thu, 16 Jan 2014 11:01:02 +0000 (12:01 +0100)
committer Thibault Delavallée <tde@openerp.com>
Thu, 16 Jan 2014 11:01:02 +0000 (12:01 +0100)
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/js/view_list.js
Simple merge
author	Thibault Delavallée <tde@openerp.com>
	Thu, 16 Jan 2014 11:01:02 +0000 (12:01 +0100)
committer	Thibault Delavallée <tde@openerp.com>
	Thu, 16 Jan 2014 11:01:02 +0000 (12:01 +0100)
		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/js/view_list.js	patch \|	diff1 \|	diff2 \|	blob \| history