Merge branch 'MDL-61166-33' of git://github.com/rezaies/moodle into MOODLE_33_STABLE
commitd251a46588a091cc25398570385f4d2ad25c12d3
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Jan 2018 09:57:57 +0000 (15 10:57 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Jan 2018 09:57:57 +0000 (15 10:57 +0100)
tree0fc77bcb4d8be8b65b9b095f1b07c5c80ab0bc42
parent20c6e3628cf849de58d5b0a4a3578d247417d05e
parent6df9abc397fbc6c1127472ff4fdfa77914986865
Merge branch 'MDL-61166-33' of git://github.com/rezaies/moodle into MOODLE_33_STABLE