[MERGE]
authorHarry (OpenERP) <hmo@tinyerp.com>
Fri, 20 Jul 2012 05:46:06 +0000 (11:16 +0530)
committerHarry (OpenERP) <hmo@tinyerp.com>
Fri, 20 Jul 2012 05:46:06 +0000 (11:16 +0530)
commite9cf08ac44e4e13f462c697c1ad476907054f236
tree1509050a0c0b3a6af40e46ed19f272466f8f79ad
parentebfa32cbe85ba868bd941cd8373643f31890e163
parent7df568d138348aa00be74340d2c5d408dd239da6
[MERGE]

bzr revid: hmo@tinyerp.com-20120720054606-24wztgdyl2ztq5b3
addons/hr_holidays/hr_holidays.py
addons/hr_holidays/hr_holidays_view.xml