Merge branch 'MDL-61993-34' of git://github.com/mihailges/moodle into MOODLE_34_STABLE
commit734825bc6dc31b0f68750cfa10db582abaaa471b
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 26 Apr 2018 23:01:14 +0000 (27 01:01 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 26 Apr 2018 23:01:14 +0000 (27 01:01 +0200)
tree4d3f39e116a99937c15cf9c6119dc303b436bf74
parentbd087739c6cee6c802f07859a19b0aff7ac39b4f
parent389fed5720aceb538186842a3a190672597be9fc
Merge branch 'MDL-61993-34' of git://github.com/mihailges/moodle into MOODLE_34_STABLE