Merge branch 'MDL-51824-master' of git://github.com/lameze/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Oct 2015 08:59:21 +0000 (09:59 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Oct 2015 08:59:21 +0000 (09:59 +0100)

Trivial merge