Merge branch 'wip-MDL-62574-33' of git://github.com/abgreeve/moodle into MOODLE_33_STABLE
commitf1c8d8a37495259241e8df279619385f0d834c69
authorJun Pataleta <jun@moodle.com>
Tue, 12 Jun 2018 03:44:58 +0000 (12 11:44 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 12 Jun 2018 03:44:58 +0000 (12 11:44 +0800)
tree155b04c941ea77ef55773bf700cc8d56814f8c2c
parent1b9f20fdf9efaf421cb25ac069ba00cb8dfa3be0
parent8e31b3241af8be63b87ef4f1c60e20c3137fca58
Merge branch 'wip-MDL-62574-33' of git://github.com/abgreeve/moodle into MOODLE_33_STABLE