Merge branch 'MDL-57205-master' of git://github.com/damyon/moodle
commitb95107ca8361e194857d7243d1e421598165969e
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 30 Nov 2016 07:03:43 +0000 (30 15:03 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 30 Nov 2016 07:03:43 +0000 (30 15:03 +0800)
tree289ce6eeaaef3cc25d8d9960485931ab684aed31
parent432ed35484b3a7fdea63dbf02eecd19c35c6fbdd
parent7c0725857aa08e822a6954a4e3e7cc368dd32b67
Merge branch 'MDL-57205-master' of git://github.com/damyon/moodle