Merge branch 'master_MDL-51015' of git://github.com/danmarsden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 11 Aug 2015 12:09:42 +0000 (14:09 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 11 Aug 2015 12:09:42 +0000 (14:09 +0200)

Trivial merge