[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-payroll

author mtr <mtr@mtr>

Mon, 14 Mar 2011 06:32:07 +0000 (12:02 +0530)

committer mtr <mtr@mtr>

Mon, 14 Mar 2011 06:32:07 +0000 (12:02 +0530)
author mtr <mtr@mtr>
Mon, 14 Mar 2011 06:32:07 +0000 (12:02 +0530)
committer mtr <mtr@mtr>
Mon, 14 Mar 2011 06:32:07 +0000 (12:02 +0530)
diff --cc addons/hr/hr.py
Simple merge
diff --cc addons/hr/hr_view.xml
Simple merge
		1	2
addons/hr/hr.py	patch \|	diff1 \|	diff2 \|	blob \| history
addons/hr/hr_view.xml	patch \|	diff1 \|	diff2 \|	blob \| history