Forward-port of latest saas-4, up to revision 5211 (revid fme@openerp.com-20140509164...

author Martin Trigaux <mat@openerp.com>

Mon, 12 May 2014 08:05:23 +0000 (10:05 +0200)

committer Martin Trigaux <mat@openerp.com>

Mon, 12 May 2014 08:05:23 +0000 (10:05 +0200)
author Martin Trigaux <mat@openerp.com>
Mon, 12 May 2014 08:05:23 +0000 (10:05 +0200)
committer Martin Trigaux <mat@openerp.com>
Mon, 12 May 2014 08:05:23 +0000 (10:05 +0200)
diff --cc openerp/addons/base/ir/ir_ui_view.py
Simple merge
diff --cc openerp/addons/base/res/res_partner_view.xml
Simple merge
diff --cc openerp/addons/base/res/res_users.py
Simple merge
author	Martin Trigaux <mat@openerp.com>
	Mon, 12 May 2014 08:05:23 +0000 (10:05 +0200)
committer	Martin Trigaux <mat@openerp.com>
	Mon, 12 May 2014 08:05:23 +0000 (10:05 +0200)
		1	2
openerp/addons/base/ir/ir_ui_view.py	patch \|	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/res/res_partner_view.xml	patch \|	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/res/res_users.py	patch \|	diff1 \|	diff2 \|	blob \| history