[MERGE] merged with lasted trunk
authorHarry (OpenERP) <hmo@tinyerp.com>
Fri, 22 Jun 2012 05:16:42 +0000 (10:46 +0530)
committerHarry (OpenERP) <hmo@tinyerp.com>
Fri, 22 Jun 2012 05:16:42 +0000 (10:46 +0530)
commit4012b47eb26e88a1352ece7d67ba6e0f038d01de
treef473e7acb9a1375f895f074e7279996832278dc8
parent48d5710cdf7559e34337ed3aeeed08183c40b892
parenteea8d596041e8f6ca3fd1d31ef3a5c5d4ae6e91d
[MERGE] merged with lasted trunk

bzr revid: hmo@tinyerp.com-20120622051642-lx7am00qyestl1w4
addons/hr_attendance/hr_attendance_view.xml
addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml