Merge branch 'MDL-55921' of https://github.com/mr-russ/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 11 Oct 2016 09:54:23 +0000 (11:54 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 11 Oct 2016 09:54:23 +0000 (11:54 +0200)

Trivial merge