Merge branch 'MDL-61993-33' of git://github.com/mihailges/moodle into MOODLE_33_STABLE
commiteaecfd8d796155e2cf49a55b02d834e9afa78e91
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 26 Apr 2018 23:01:36 +0000 (27 01:01 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 26 Apr 2018 23:01:36 +0000 (27 01:01 +0200)
tree5e9625972fdad02bbbe9c5ebab46fc655c1b4575
parent7dbc8221319b5cbf972b2472f7ebe00b841bd3e1
parent27fa56c9f839e2053b74bc3e60343cf8c08a36e9
Merge branch 'MDL-61993-33' of git://github.com/mihailges/moodle into MOODLE_33_STABLE