Merge branch 'MDL-61068-33' of git://github.com/andrewnicols/moodle into MOODLE_33_STABLE
commit1a7ded08927aa391f84a18b25062675dc086c74e
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Jan 2018 18:56:42 +0000 (8 19:56 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Jan 2018 18:56:42 +0000 (8 19:56 +0100)
treef05650342ee27ef0b58494321eaa1b8f7ba6fab4
parent504bde611848b4cc6d9efc0134c8918936ded357
parentff0edf2d12b91e0e3240df9be502fc9dd88c37e5
Merge branch 'MDL-61068-33' of git://github.com/andrewnicols/moodle into MOODLE_33_STABLE