Merge branch 'MDL-49231-master-fix2' of https://github.com/FMCorz/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 6 Jan 2016 04:05:34 +0000 (12:05 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 6 Jan 2016 04:05:34 +0000 (12:05 +0800)
commit81117053b30fc779c8522db6f7baf791bb978b06
treea87d386139784ee541233d29ad46f3f8eb2ea19e
parent37727364bb75c6568577fc77692eb8fced2f13fd
parent0c48895bb79ec4e82197a70633f6c20fad9715f7
Merge branch 'MDL-49231-master-fix2' of https://github.com/FMCorz/moodle