Merge branch 'MDL-52838-master' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 10 Nov 2017 03:38:13 +0000 (11:38 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 10 Nov 2017 03:38:13 +0000 (11:38 +0800)
commit6e2d8c121bc8c65206976fa00fab2bc2bfe1dac4
tree26342ff28e5871ab681e199906cd712e52666fe2
parent6b2a9a6fb84e1fae01ec25ffb5d2cead3cc83816
parentce225e1c5e043ddd27b2864b231c62de8467bee3
Merge branch 'MDL-52838-master' of git://github.com/damyon/moodle