Merge branch 'MDL-37806-workshop-next' of git://github.com/mudrd8mz/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 4 Feb 2013 04:48:42 +0000 (12:48 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 4 Feb 2013 04:48:42 +0000 (12:48 +0800)

Trivial merge