Merge branch 'master_MDL-37714' of git://github.com/greg-or/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Feb 2014 16:58:30 +0000 (17:58 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Feb 2014 16:58:30 +0000 (17:58 +0100)

Trivial merge