Merge branch 'MDL-59275-master' of git://github.com/lameze/moodle
commitcb37f200a89423d92ac80be86bf6446b1c208d2b
authorJake Dallimore <jake@moodle.com>
Tue, 27 Jun 2017 05:57:11 +0000 (27 13:57 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 27 Jun 2017 05:57:11 +0000 (27 13:57 +0800)
tree537f6359f6aaa344d1ceac897d7164c71f89e34a
parent196558a5d82846e6b8deb4398dde7946b5953276
parent92c8cb9d987aad70082bb36c941af9070c51ec8b
Merge branch 'MDL-59275-master' of git://github.com/lameze/moodle