Merge branch 'wip-MDL-61242-33' of git://github.com/abgreeve/moodle into MOODLE_33_STABLE
commit17384a4a8e8c0ccb32388a88cc72f30ba212273d
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 29 Jan 2018 00:41:23 +0000 (29 01:41 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 29 Jan 2018 00:41:23 +0000 (29 01:41 +0100)
treee1ae6cbae62cd58eb8954403ddaa91439d8fac3d
parenta11dae7625d78e0decb6bea1da4551ee8e9ffdfe
parent5b7ee7d6b394b4dea66db7e1b4b6238120d5338a
Merge branch 'wip-MDL-61242-33' of git://github.com/abgreeve/moodle into MOODLE_33_STABLE