Merge branch 'MDL-50145_master' of git://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Jun 2015 18:40:56 +0000 (20:40 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Jun 2015 18:40:56 +0000 (20:40 +0200)

Trivial merge