Merge branch 'MDL-57704-master' of https://github.com/xow/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 2 May 2017 02:35:46 +0000 (10:35 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 2 May 2017 02:35:46 +0000 (10:35 +0800)
commit4270ebea382a493b140e7a301322adbe5158ea75
treea95e2f2f7dc8efa0876012a432fe7925ac71fb98
parentdb2c66e700e44b4f07f0d0fa9eb2ec099a9cac66
parent087662037b0cd2961938ab6d592bbe7200839a71
Merge branch 'MDL-57704-master' of https://github.com/xow/moodle