Merge branch 'MDL-62482' of git://github.com/timhunt/moodle
commitf94aaed80b4873f57151520f2616491a6e1d01fe
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 22 May 2018 01:37:57 +0000 (22 09:37 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 22 May 2018 01:37:57 +0000 (22 09:37 +0800)
tree198d7806ca10c70c9fcef09b08a33e82344b9498
parent227d6d68a37dcb6f8275d40caf7b88d85057d9d6
parent27d625a8639ffd7865c2b1d8a99e8fd6f8effd08
Merge branch 'MDL-62482' of git://github.com/timhunt/moodle