[MERGE] lp:767238
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Wed, 27 Apr 2011 08:03:32 +0000 (10:03 +0200)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Wed, 27 Apr 2011 08:03:32 +0000 (10:03 +0200)
commitf9a1e706a83e602ff2aae7195f88d59d9794ff98
tree3fcdf57bd3b87fa44ee11235d78fd7babd16d037
parent42367f5fb43e18828655aa4691794306ea75fe49
parent68122978876bcd886c8ef6a839348ba2b056cf48
[MERGE] lp:767238

bzr revid: qdp-launchpad@openerp.com-20110427080332-qdwytwgd97ekj35v
addons/hr_holidays/hr_holidays.py
addons/hr_holidays/hr_holidays_view.xml