Merge branch 'MDL-37781-workshop-schedule' of git://github.com/mudrd8mz/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 4 Feb 2013 08:18:00 +0000 (16:18 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 4 Feb 2013 08:18:00 +0000 (16:18 +0800)

Trivial merge