[MERGE]:lp:~openerp-dev/openobject-addons/trunk-hr-improvements-holidays-sgo
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Mon, 19 Mar 2012 05:20:52 +0000 (10:50 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Mon, 19 Mar 2012 05:20:52 +0000 (10:50 +0530)
commita2178b69e7d146fc33bf77dbda9b6ad3b59f5977
tree9c4ad7d46f35df6389d08596f78afb65c574decc
parent11c5aa7b2e98370a3d2cbbf35aa783d49d649de7
parent0b2d045f91c56751d517bd8fb5dda377ac0b6111
[MERGE]:lp:~openerp-dev/openobject-addons/trunk-hr-improvements-holidays-sgo

bzr revid: apa@tinyerp.com-20120319052052-1i543wpq7hulle2u
addons/hr_holidays/hr_holidays_view.xml