[MERGE] Merged the branch for the fix of hr_holidays
authorJay Vora (OpenERP) <jvo@tinyerp.com>
Tue, 7 Jun 2011 17:29:43 +0000 (22:59 +0530)
committerJay Vora (OpenERP) <jvo@tinyerp.com>
Tue, 7 Jun 2011 17:29:43 +0000 (22:59 +0530)
bzr revid: jvo@tinyerp.com-20110607172943-yltnxcyaphbt71d8


Trivial merge