Merge branch 'MDL-57407-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 12 Sep 2017 08:33:30 +0000 (10:33 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 12 Sep 2017 08:33:30 +0000 (10:33 +0200)

Trivial merge