[MERGE] merge with parent branch
authorRandhir Mayatra (OpenERP) <rma@tinyerp.com>
Tue, 23 Oct 2012 09:29:00 +0000 (14:59 +0530)
committerRandhir Mayatra (OpenERP) <rma@tinyerp.com>
Tue, 23 Oct 2012 09:29:00 +0000 (14:59 +0530)
commit21bd09e0179a0e8d669dec8e298d2c262df06295
tree18dc1166c1f528a1956e0e98ca55198cd2047423
parent1f4599e97ce600583e6b3d2532d13b6586e94956
parente8371fba7b9df5f0968c7b708221a06eeadcf4ff
[MERGE] merge with parent branch

bzr revid: rma@tinyerp.com-20121023092900-4wq51tm4w51cpdp5
addons/project_timesheet/project_timesheet.py