[MERGE]merge with addons trunk
authorSanjay Gohel (Open ERP) <sgo@tinyerp.com>
Thu, 21 Jun 2012 11:36:37 +0000 (17:06 +0530)
committerSanjay Gohel (Open ERP) <sgo@tinyerp.com>
Thu, 21 Jun 2012 11:36:37 +0000 (17:06 +0530)
commit252ad631ad1468749df80ddb812583510b720d9d
tree236998d9c1a91eb5f2c1a0bd10f2c4d10556af66
parentb58e3b19b123d0e5fd4b4488ebf6d21efe705eed
parentd17d4384058155649e6013d162f0182131d03dc4
[MERGE]merge with addons trunk

bzr revid: sgo@tinyerp.com-20120621113637-d66sg08zyjlb3lgr
addons/hr_holidays/hr_holidays_view.xml
addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml