Merge branch 'MDL-59974-master' of git://github.com/lameze/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 4 Sep 2017 11:55:31 +0000 (13:55 +0200)
committerDavid Monllao <davidm@moodle.com>
Thu, 7 Sep 2017 08:50:17 +0000 (10:50 +0200)

Trivial merge