Merge branch 'MDL-35987-master' of git://github.com/FMCorz/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 30 May 2016 05:38:52 +0000 (13:38 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 30 May 2016 05:38:52 +0000 (13:38 +0800)
commit7c8f4f6b709cf37d347154e7bed4663fc4605986
treeb296aab8d8d61ac014e04cbbdcd70fc2a3a9b8b1
parent485de1219970a3a93336ab8ca5700255de9b4526
parent9a601adc9e2516725e12e3d097b5fa1024a1e020
Merge branch 'MDL-35987-master' of git://github.com/FMCorz/moodle