Merge branch 'MDL-48970' of https://github.com/andrewhancox/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Aug 2015 14:11:47 +0000 (16:11 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Aug 2015 14:11:47 +0000 (16:11 +0200)

Trivial merge