[MERGE]
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Tue, 20 Mar 2012 09:34:17 +0000 (15:04 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Tue, 20 Mar 2012 09:34:17 +0000 (15:04 +0530)
commit5188e3c16372fd4bee858ca23ce6d750978ced3e
tree201e7b8fa13a77bb605e53e1764829fad7d918ae
parent9993724b55a636ea4b3ea2b7941f5031fe86502c
parent62c49d4013fac9fb5abd2ab847390b9e05fdffa2
[MERGE]

bzr revid: apa@tinyerp.com-20120320093417-ffu9qiy0zt2606gr
addons/hr_holidays/hr_holidays_view.xml