Merge branch 'MDL-56046_master' of git://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 27 Jun 2017 00:42:31 +0000 (02:42 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 27 Jun 2017 00:42:31 +0000 (02:42 +0200)
commit7ad2822269900399da7c5255dae75cd326e5c323
treef2bb048ca97e036bc73f4b4ca257b47dfd9d8122
parent139648e5bd26917d8eb7ceba7905b9b6a1060fff
parentfaf45f9c4771656e90f17edfee30b2c482143159
Merge branch 'MDL-56046_master' of git://github.com/markn86/moodle