Merge branch 'MDL-62224_33' of git://github.com/markn86/moodle into MOODLE_33_STABLE
commit6b003a5bc1649ee71032f9b08c2edf5758eadd56
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 26 Apr 2018 15:38:46 +0000 (26 17:38 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 26 Apr 2018 15:38:46 +0000 (26 17:38 +0200)
treeb1ec6cecb6278cd138727ac67c9f5ed8b2e5ba57
parenta20987ace8cbae0d43408078a3410caf2eb8a8fd
parent9db105491951579d63399ec75a4ea94a77470dfd
Merge branch 'MDL-62224_33' of git://github.com/markn86/moodle into MOODLE_33_STABLE