Merge with trunk addons
authorVir (Open ERP) <vir@tinyerp.com>
Wed, 20 Jan 2010 06:56:11 +0000 (12:26 +0530)
committerVir (Open ERP) <vir@tinyerp.com>
Wed, 20 Jan 2010 06:56:11 +0000 (12:26 +0530)
bzr revid: vir@tinyerp.com-20100120065611-inrbplhiwq2p5tg5

1  2 
addons/hr/hr_view.xml
addons/hr_holidays/hr_view.xml

Simple merge
Simple merge