Merge branch 'MDL-58179-33' of https://github.com/lucaboesch/moodle into MOODLE_33_STABLE
commitbc360e9441e50261259a79d22834074e062ba4ab
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 19 Mar 2018 02:32:29 +0000 (19 10:32 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 19 Mar 2018 02:32:29 +0000 (19 10:32 +0800)
treed52ee30d015198e6c886b3475e6d244fbb7e1a50
parente786a591d538204fad37f188018f8c82f69a28f2
parenta1e64b07b50e8cf60d14605fb4597c3f561f1e1b
Merge branch 'MDL-58179-33' of https://github.com/lucaboesch/moodle into MOODLE_33_STABLE