[MERGE]merge with trunk
authorSanjay Gohel (Open ERP) <sgo@tinyerp.com>
Thu, 5 Jul 2012 13:20:21 +0000 (18:50 +0530)
committerSanjay Gohel (Open ERP) <sgo@tinyerp.com>
Thu, 5 Jul 2012 13:20:21 +0000 (18:50 +0530)
bzr revid: sgo@tinyerp.com-20120705132021-a1cizo3l02mg70x1

1  2 
addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml