[Merge]with : lp:openobject-addons
authorDBR (OpenERP) <dbr@tinyerp.com>
Mon, 9 Jul 2012 13:20:23 +0000 (18:50 +0530)
committerDBR (OpenERP) <dbr@tinyerp.com>
Mon, 9 Jul 2012 13:20:23 +0000 (18:50 +0530)
commitd31835fbfb0a845be25bb36f139f2a360016caa4
tree42ff4f334fb2a8955a637d4541e10dde6107ac53
parentfb377c440e245bb7c06325c8ffb3cfdedf4dd72d
parente9c288b4bf9b82e505ee94a44b5c0e5dfd1f45f8
[Merge]with : lp:openobject-addons

bzr revid: dbr@tinyerp.com-20120709132023-962cwpkvwppdtawa
addons/hr_holidays/hr_holidays.py
addons/hr_holidays/hr_holidays_workflow.xml