[MERGE] branch merged with lp:openobject-addons
authorMeera Trambadia <mtr@tinyerp.com>
Fri, 3 Aug 2012 06:23:51 +0000 (11:53 +0530)
committerMeera Trambadia <mtr@tinyerp.com>
Fri, 3 Aug 2012 06:23:51 +0000 (11:53 +0530)
bzr revid: mtr@tinyerp.com-20120803062351-j3t1vv7mt5mqg1hk

1  2 
addons/hr_holidays/hr_holidays_view.xml