[MERGE]: Merged with lp:openobject-addons
authorAtul Patel (OpenERP) <atp@tinyerp.com>
Fri, 16 Nov 2012 06:10:05 +0000 (11:40 +0530)
committerAtul Patel (OpenERP) <atp@tinyerp.com>
Fri, 16 Nov 2012 06:10:05 +0000 (11:40 +0530)
bzr revid: atp@tinyerp.com-20121116061005-68rksxv7uz67hud3

1  2 
addons/hr_holidays/hr_holidays_view.xml