Merge branch 'MDL-59367-master-fix1' of http://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 26 Jul 2017 05:26:12 +0000 (13:26 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 26 Jul 2017 05:26:12 +0000 (13:26 +0800)
commita8168eb98189d9d31dcfe74b73598c0ec60e99d8
treef9e063d9751f716774ce819cf1b3cd0b24e40347
parent7740e186e19dc0ddb6d756b1cc5109f5ab0ac4bc
parent0ae28fad3ad6e72095f1918019df8e41bcc3b1fa
Merge branch 'MDL-59367-master-fix1' of github.com/damyon/moodle