Merge branch 'MDL-61975-33' of git://github.com/zig-moodle/moodle into MOODLE_33_STABLE
commitbe960b40a0825200a5b1114fb671ea12a2bc0e54
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 20 Apr 2018 00:18:14 +0000 (20 02:18 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 20 Apr 2018 00:18:14 +0000 (20 02:18 +0200)
tree93e432c43d8cb9681943b587b5cfbf29b7f505c0
parenta5ca61930d0354df817b9d7696dbbcdfcee750e7
parentc4b7e6de553e69f43797b55c1b414ada52a3665e
Merge branch 'MDL-61975-33' of git://github.com/zig-moodle/moodle into MOODLE_33_STABLE