[MRG] merge with lp:~openerp-dev/openobject-addons/trunk-10click-hr

author Turkesh Patel (Open ERP) <tpa@tinyerp.com>

Mon, 29 Oct 2012 09:58:11 +0000 (15:28 +0530)

committer Turkesh Patel (Open ERP) <tpa@tinyerp.com>

Mon, 29 Oct 2012 09:58:11 +0000 (15:28 +0530)
author Turkesh Patel (Open ERP) <tpa@tinyerp.com>
Mon, 29 Oct 2012 09:58:11 +0000 (15:28 +0530)
committer Turkesh Patel (Open ERP) <tpa@tinyerp.com>
Mon, 29 Oct 2012 09:58:11 +0000 (15:28 +0530)
diff --cc addons/hr_holidays/hr_holidays.py
Simple merge
diff --cc addons/hr_holidays/hr_holidays_view.xml
Simple merge
author	Turkesh Patel (Open ERP) <tpa@tinyerp.com>
	Mon, 29 Oct 2012 09:58:11 +0000 (15:28 +0530)
committer	Turkesh Patel (Open ERP) <tpa@tinyerp.com>
	Mon, 29 Oct 2012 09:58:11 +0000 (15:28 +0530)
		1	2
addons/hr_holidays/hr_holidays.py	patch \|	diff1 \|	diff2 \|	blob \| history
addons/hr_holidays/hr_holidays_view.xml	patch \|	diff1 \|	diff2 \|	blob \| history