Merge branch 'MDL-61040-master' of git://github.com/junpataleta/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 18 Dec 2017 16:24:52 +0000 (17:24 +0100)
committerDavid Monllao <davidm@moodle.com>
Mon, 18 Dec 2017 16:24:52 +0000 (17:24 +0100)

Trivial merge