Merge branch 'MDL-59431' of git://github.com/timhunt/moodle
authorDavid Monllao <david.monllao@gmail.com>
Tue, 11 Jul 2017 10:05:30 +0000 (12:05 +0200)
committerDavid Monllao <david.monllao@gmail.com>
Tue, 11 Jul 2017 10:05:30 +0000 (12:05 +0200)

Trivial merge