Merge branch 'MDL-62224_34' of git://github.com/markn86/moodle into MOODLE_34_STABLE
commit8e786a3a304448b9b4abb76e0ed614071a04c76b
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 26 Apr 2018 15:38:35 +0000 (26 17:38 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 26 Apr 2018 15:38:35 +0000 (26 17:38 +0200)
tree982f916b25986907b87adeabb0700ef829a0266d
parent45742c52a4898a2fe3d7e2535672a054be6c3f34
parentd45a552c029e0d98734e0e76dfcb284acc882ed6
Merge branch 'MDL-62224_34' of git://github.com/markn86/moodle into MOODLE_34_STABLE