Merge branch 'MDL-44273' of https://github.com/NeillM/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Aug 2015 18:24:00 +0000 (20:24 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Aug 2015 18:24:00 +0000 (20:24 +0200)

Trivial merge