Merge branch 'MDL-37810-master' of https://github.com/snake/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Sep 2017 23:45:29 +0000 (01:45 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Sep 2017 23:45:29 +0000 (01:45 +0200)
commitdffca4994500b80ebc15abfb0a4f248b9eb19316
tree1cdd95a8ce791312c25ae9196efe17653ea4b719
parent00045100d00e393eab24e7a9eed47c5f7a71304a
parent434d138c2af9cd806a2e625c34fc860506b25a7c
Merge branch 'MDL-37810-master' of https://github.com/snake/moodle