Merge branch 'MDL-52544-master' of git://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Jul 2016 02:04:18 +0000 (04:04 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Jul 2016 02:04:18 +0000 (04:04 +0200)

Trivial merge