Merge branch 'MDL-60965-master' of git://github.com/andrewnicols/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 12 Dec 2017 03:15:03 +0000 (11:15 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 12 Dec 2017 03:15:03 +0000 (11:15 +0800)
commit6b58bb56cb955769e3b13e2ef349deed43023032
treec7d59770196f7bbf4bcfa39abde330055886fd19
parentf0d9af6036c8bd084f1e55bdffcf239636a2f60e
parenta7d75ba5c8a582e45ad94268fe3da1a69239adb1
Merge branch 'MDL-60965-master' of git://github.com/andrewnicols/moodle