[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)
commit14fdc7497ca9de58afeb4d9ecdfe7fcff33eeefb
tree1afdde972b6de4edb2e08e69e3959cb9daf9ac3d
parent05fc9d4baf4c9314f94d58f226b1009f3603ff3e
parent46c83756dad86dfea2391bd33e5c5c4d09fac800
[MERGE] merge with lp:openobject-addons

bzr revid: cha@tinyerp.com-20121008045651-kt3esedbe5vy5dhk
addons/hr_holidays/hr_holidays_view.xml