[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)
commit8e50c5df5e6e7a9ce98eb360a4579a1559251f40
treed27d4cf88d816bc719f9b154cbdf30e1c3e114dc
parent951844a151aece177d2ff6ceddfa843bbba9d132
parent3c8626efbbe8b4d60154d0b9660cc9c0c0373e0b
[MERGE]: Merged with lp:openobject-addons

bzr revid: atp@tinyerp.com-20121116061005-68rksxv7uz67hud3
addons/hr_holidays/hr_holidays_view.xml