[MERGE]
authorpso <pso@tinyerp.com>
Fri, 8 Oct 2010 13:04:04 +0000 (18:34 +0530)
committerpso <pso@tinyerp.com>
Fri, 8 Oct 2010 13:04:04 +0000 (18:34 +0530)
commit0fe5577eec85104ef06bce607a9c6e95fddfd5cc
treef4a10d5a4655e552b4922ddcebaf3410f87c4602
parent1432890595215f60f0a43d4c9ce45388b6b0cb37
parent4f284c3ac2dca902caec96b3c291f9c1d16a4e05
[MERGE]

bzr revid: pso@tinyerp.com-20101007084400-g5aw4l9ugaglxnkx
bzr revid: pso@tinyerp.com-20101008130404-60lykip7dx3yx5cd
addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml