[MERGE] merge with lp:openobject-addons
authorAjay Chauhan (OpenERP) <cha@tinyerp.com>
Mon, 8 Oct 2012 04:56:51 +0000 (10:26 +0530)
committerAjay Chauhan (OpenERP) <cha@tinyerp.com>
Mon, 8 Oct 2012 04:56:51 +0000 (10:26 +0530)
bzr revid: cha@tinyerp.com-20121008045651-kt3esedbe5vy5dhk

1  2 
addons/hr_holidays/hr_holidays_view.xml