Merge branch 'MDL-47655-master-fix1' of git://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 17 Oct 2014 07:37:55 +0000 (09:37 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 17 Oct 2014 07:37:55 +0000 (09:37 +0200)

Trivial merge