Merge branch 'wip-MDL-58362-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <david.monllao@gmail.com>
Tue, 18 Jul 2017 07:08:30 +0000 (09:08 +0200)
committerDavid Monllao <david.monllao@gmail.com>
Tue, 18 Jul 2017 07:08:30 +0000 (09:08 +0200)

Trivial merge