[MRG] merge with lp:~openerp-dev/openobject-addons/trunk-10click-hr
authorTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Mon, 29 Oct 2012 09:58:11 +0000 (15:28 +0530)
committerTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Mon, 29 Oct 2012 09:58:11 +0000 (15:28 +0530)
commit4a75f8698fbb996d53fac982b0b06a42aac77c58
tree17c12b19d500efcab9d6bb89a16076cf05a60008
parentffc347d3aed24e8d88a33fdff940a42ef07b8812
parent3858225f3b39b70e02f61bbdef9467e2f4474fa3
[MRG] merge with lp:~openerp-dev/openobject-addons/trunk-10click-hr

bzr revid: tpa@tinyerp.com-20121029095811-22t0bop2o5da96g3
addons/hr_holidays/hr_holidays.py
addons/hr_holidays/hr_holidays_view.xml