From: Damyon Wiese <damyon@moodle.com>
Date: Mon, 4 Feb 2013 08:18:00 +0000 (+0800)
Subject: Merge branch 'MDL-37781-workshop-schedule' of git://github.com/mudrd8mz/moodle
X-Git-Tag: v2.5.0-beta~618
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=935ec5e77e29394feed4d55a5d0fa0a0751f7618

Merge branch 'MDL-37781-workshop-schedule' of git://github.com/mudrd8mz/moodle
---

935ec5e77e29394feed4d55a5d0fa0a0751f7618