Merge branch 'MDL-31683' of git://github.com/Lightwork-Marking/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 17 Oct 2012 02:57:36 +0000 (10:57 +0800)
committerSam Hemelryk <sam@moodle.com>
Wed, 17 Oct 2012 02:57:36 +0000 (10:57 +0800)

Trivial merge