Merge branch 'MDL-53687-master' of git://github.com/FMCorz/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 24 May 2016 00:59:47 +0000 (08:59 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 24 May 2016 00:59:47 +0000 (08:59 +0800)
commit939f2b31f9c487c52b9e29f50227219b0ae2d21f
tree9fc3d22e637b64e4439152c97aa06d3c69d063a7
parent21eef944363266d14b3a9c3bf2b45e47652de480
parentc2f430a813a7fba0a326221d92041b1073069181
Merge branch 'MDL-53687-master' of git://github.com/FMCorz/moodle