Merge branch 'MDL-59509-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <david.monllao@gmail.com>
Mon, 24 Jul 2017 11:03:10 +0000 (13:03 +0200)
committerDavid Monllao <david.monllao@gmail.com>
Mon, 24 Jul 2017 11:03:10 +0000 (13:03 +0200)

Trivial merge