Merge branch 'MDL-60765-master' of git://github.com/andrewnicols/moodle
authorDamyon Wiese <damyon@moodle.com>
Fri, 10 Nov 2017 02:55:09 +0000 (10:55 +0800)
committerDamyon Wiese <damyon@moodle.com>
Fri, 10 Nov 2017 02:55:09 +0000 (10:55 +0800)
commit6b2a9a6fb84e1fae01ec25ffb5d2cead3cc83816
tree133489c5a8f6b4f382ead2e4237e24004b836252
parentf5b63fc8294c22a8a70516b82ecaa98d8f06031b
parentfb5bbf142486356ccaf06c8b140b2ccc7ea91091
Merge branch 'MDL-60765-master' of git://github.com/andrewnicols/moodle