[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)
bzr revid: rma@tinyerp.com-20121219101915-u27fbsw4x3jscaof

1  2 
addons/hr_holidays/hr_holidays_view.xml