Merge branch 'MDL-45636-course_master' of https://github.com/eSrem/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 4 Nov 2014 05:47:51 +0000 (13:47 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 4 Nov 2014 05:47:51 +0000 (13:47 +0800)

Trivial merge