Merge branch 'MDL-49032' of https://github.com/stronk7/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Sep 2015 23:00:03 +0000 (01:00 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Sep 2015 23:00:03 +0000 (01:00 +0200)

Trivial merge