[MERGE] merge with lp:openobject-addons
authorAjay Chauhan (OpenERP) <cha@tinyerp.com>
Tue, 30 Oct 2012 05:03:23 +0000 (10:33 +0530)
committerAjay Chauhan (OpenERP) <cha@tinyerp.com>
Tue, 30 Oct 2012 05:03:23 +0000 (10:33 +0530)
commit3894874ebbe97ed6b00f5cfa883e500dad6c5d2b
tree71632d9822c0d8656dd47a245d2da4108f63bbc0
parent4288a65ccf266892f86632a9039cca44e2de901c
parentac3f0efec6a1c0d719cfd0a019355da4f8ec6d01
[MERGE] merge with lp:openobject-addons

bzr revid: cha@tinyerp.com-20121030050323-cpn92n9txy0xw5gj
addons/hr_holidays/hr_holidays_view.xml
addons/hr_timesheet_sheet/hr_timesheet_sheet.py