Merge branch 'MDL-41738' of https://github.com/Lightwork-Marking/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 1 Oct 2013 21:27:54 +0000 (10:27 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 1 Oct 2013 21:27:54 +0000 (10:27 +1300)

Trivial merge