[MERGE] with trunk
authorNimesh (Open ERP) <nco@tinyerp.com>
Mon, 10 Dec 2012 07:27:23 +0000 (12:57 +0530)
committerNimesh (Open ERP) <nco@tinyerp.com>
Mon, 10 Dec 2012 07:27:23 +0000 (12:57 +0530)
commitb969ecc49f47632681fae2885378a514b2f7980f
tree602c088134d5d56e322d54fcf938a3e3d6d06535
parentc1ea2b82a17028a345fff60c75807f478cf6c2ac
parent7f1d5daf2f7a137a470a4a72779408edf7995910
[MERGE] with trunk

bzr revid: nco@tinyerp.com-20121210072723-avqvehqgnpxwdimj
addons/hr_evaluation/hr_evaluation.py
addons/hr_holidays/hr_holidays_view.xml
addons/hr_timesheet/hr_timesheet_view.xml