Merge branch 'MDL-57772-master' of git://github.com/damyon/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 7 Nov 2017 07:01:31 +0000 (15:01 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 7 Nov 2017 07:01:31 +0000 (15:01 +0800)
commit7783fd0ec124a98baac677da3991985cb90b6c57
tree0fb06e92561e9809b4b544ea7e57c74300dc01d0
parenteaa43a132c8023f7158f0d5c5441bcadb2dc6bc4
parentefe2681894967ed083049437bdc986301c92feec
Merge branch 'MDL-57772-master' of git://github.com/damyon/moodle