Merge branch 'MDL-36541' of https://github.com/Lightwork-Marking/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Feb 2013 12:02:56 +0000 (13:02 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Feb 2013 12:02:56 +0000 (13:02 +0100)

Trivial merge