[MERGE]
authorpso <pso@tinyerp.com>
Mon, 11 Oct 2010 05:22:24 +0000 (10:52 +0530)
committerpso <pso@tinyerp.com>
Mon, 11 Oct 2010 05:22:24 +0000 (10:52 +0530)
commit7b70982b187f78150ec123bae22aa04d17db31c7
tree6f9060d9e06a4334bf89de0e334394473ff5fde3
parent0fe5577eec85104ef06bce607a9c6e95fddfd5cc
parent9e8be15fd5887201694d9b45df04bf17834eef68
[MERGE]

bzr revid: pso@tinyerp.com-20101011052224-e88mg3fc7g1ke90l
addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
addons/project_planning/project_planning_view.xml