Merge branch 'MDL-61828-33' of git://github.com/andrewnicols/moodle into MOODLE_33_STABLE
commit6477811c56c777a6b6f37811129f9800594ec86a
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Apr 2018 22:14:57 +0000 (12 00:14 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Apr 2018 22:14:57 +0000 (12 00:14 +0200)
treea9cb155aaaf5cb4d15f53c12d0a04f66a7edc07a
parent0103da4a9720f3f80cf2c9bcb42735fa18d7562d
parent0014edcb6e979f207424ba3e5aa230fa5794c8c3
Merge branch 'MDL-61828-33' of git://github.com/andrewnicols/moodle into MOODLE_33_STABLE