[MERGE]:lp:~openerp-dev/openobject-addons/trunk-hr_timesheet_sheet-topbar-tpa
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Fri, 27 Apr 2012 10:03:24 +0000 (15:33 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Fri, 27 Apr 2012 10:03:24 +0000 (15:33 +0530)
commitb4496821f890e254fe981cccfe6c03511b9c65b7
tree7b79d17ee0bd8c7271cefcc5d0b3ad1271a32f4a
parent8d3365c1bab2a33fa8dcdc828deef832e947fc8e
parent0960f9b10580faaea9bb3f84f41153aac5b5a7b3
[MERGE]:lp:~openerp-dev/openobject-addons/trunk-hr_timesheet_sheet-topbar-tpa

bzr revid: apa@tinyerp.com-20120427100324-7s7rgmo78ehetvw5