[MERGE] merge with parent
authorRandhir Mayatra (OpenERP) <rma@tinyerp.com>
Wed, 19 Dec 2012 10:19:15 +0000 (15:49 +0530)
committerRandhir Mayatra (OpenERP) <rma@tinyerp.com>
Wed, 19 Dec 2012 10:19:15 +0000 (15:49 +0530)
commitf649687bf1fc56e2574f0d666ad39ce818ffd578
tree091ba43fe543e58e8be54e0ccc78b72e68017dfa
parentbbefec242daddf752d0957e910540cc90ad9d793
parentf81ff1851503fb99375ac9633dfc3e77b5a93d6c
[MERGE] merge with parent

bzr revid: rma@tinyerp.com-20121219101915-u27fbsw4x3jscaof
addons/hr_holidays/hr_holidays_view.xml