Merge branch 'MDL-60233-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 19 Oct 2017 11:49:23 +0000 (13:49 +0200)
committerDavid Monllao <davidm@moodle.com>
Thu, 19 Oct 2017 11:49:23 +0000 (13:49 +0200)

Trivial merge