Merge branch 'MDL-40547' of https://github.com/Lightwork-Marking/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 29 Jul 2013 02:41:54 +0000 (10:41 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 29 Jul 2013 02:41:54 +0000 (10:41 +0800)

Trivial merge