[MERGE] merge with lp:openobject-addons
authorAjay Chauhan (OpenERP) <cha@tinyerp.com>
Tue, 23 Oct 2012 05:17:50 +0000 (10:47 +0530)
committerAjay Chauhan (OpenERP) <cha@tinyerp.com>
Tue, 23 Oct 2012 05:17:50 +0000 (10:47 +0530)
commitd48ba6553f943873f98b2bf13121bf0b595fe91f
tree9c306fdae0910975b4073faa9ee8ccf6cabf14da
parent12246cfb2b84d0f23556756de2f4a8c13463ff17
parentc55438e695d03854ebf1b82aa0d6b33b3dc278f0
[MERGE] merge with lp:openobject-addons

bzr revid: cha@tinyerp.com-20121023051750-jcddzn3dq1d8u12q
addons/hr_holidays/hr_holidays_view.xml