merge trunk
authorniv-openerp <nicolas.vanhoren@openerp.com>
Tue, 2 Oct 2012 12:29:39 +0000 (14:29 +0200)
committerniv-openerp <nicolas.vanhoren@openerp.com>
Tue, 2 Oct 2012 12:29:39 +0000 (14:29 +0200)
bzr revid: nicolas.vanhoren@openerp.com-20121002122939-xr3by0mdqzri0lss

1  2 
addons/hr_timesheet_sheet/hr_timesheet_sheet.py