Merge branch 'MDL-50456-master' of git://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 7 Jun 2015 19:56:18 +0000 (21:56 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 7 Jun 2015 19:56:18 +0000 (21:56 +0200)

Trivial merge