Merge branch 'MDL-37470' of https://github.com/mike-grant/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Mar 2015 00:43:47 +0000 (01:43 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Mar 2015 00:43:47 +0000 (01:43 +0100)

Trivial merge