Merge branch 'MDL-61234-33' of git://github.com/andrewnicols/moodle into MOODLE_33_STABLE
commite288c6314f2aa5b5ff247145c7185ef204b9b6f8
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Jan 2018 01:04:08 +0000 (22 02:04 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Jan 2018 01:04:08 +0000 (22 02:04 +0100)
treefdb8242cd494242eb022ecd304d114e5d1a10eff
parent4865f138c71fc825622d324e7203d06583837ec3
parente1a489362c6866a420c98c55d2a7e5b507c4cb14
Merge branch 'MDL-61234-33' of git://github.com/andrewnicols/moodle into MOODLE_33_STABLE