Merge branch 'master-mdl33971' of https://github.com/tlock/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Dec 2013 16:17:06 +0000 (17:17 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Dec 2013 16:17:06 +0000 (17:17 +0100)

Trivial merge