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)
commited6420b082a4e5e2fc0dae0aafbfaf0af5d34c07
treebd62c36d2627d0500619f506e8c395434c21cc02
parent2a5ccc7f7fc2fb8dc963a49fa46ecfbd82824908
parentd351065fb195ed7d20a5087a0f650fc37672f39e
Merge with trunk addons

bzr revid: vir@tinyerp.com-20100120065611-inrbplhiwq2p5tg5
addons/hr/hr_view.xml
addons/hr_holidays/hr_view.xml