Merge branch 'MDL-61002-31' of git://github.com/andrewnicols/moodle into MOODLE_31_STABLE
commit28964ed251601777600a549a52952af535fe3a6f
authorDamyon Wiese <damyon@moodle.com>
Mon, 11 Dec 2017 01:49:00 +0000 (11 09:49 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 11 Dec 2017 01:49:00 +0000 (11 09:49 +0800)
tree80188c782234929012c79708289229f6cc3be203
parentb8067e0b01d7bdd6009ef09126d5e30777981e92
parente362c66d49c890845c4b8ae150aa4b29d3c777a5
Merge branch 'MDL-61002-31' of git://github.com/andrewnicols/moodle into MOODLE_31_STABLE