Merge branch 'wip-MDL-62755-33' of git://github.com/abgreeve/moodle into MOODLE_33_STABLE
commit31aa968f4315f7ed3e471e3e55ce1713ee3f2757
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 27 Jun 2018 23:57:03 +0000 (28 01:57 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 27 Jun 2018 23:57:03 +0000 (28 01:57 +0200)
treed382ab60f510a1ec1e1df296ca2c944fce5da22a
parentff3187ba502a0c8c7ff21e4c6a804dbdaddd70d8
parent560ddebb0513c3cc8aae4c90919f23fddc839620
Merge branch 'wip-MDL-62755-33' of git://github.com/abgreeve/moodle into MOODLE_33_STABLE