Merge branch 'MDL-59578-master' of git://github.com/junpataleta/moodle
commit55399cd77659e94073174c40b41ae136ccc45de1
authorDavid Monllao <davidm@moodle.com>
Tue, 25 Jul 2017 09:09:44 +0000 (25 11:09 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 25 Jul 2017 09:09:44 +0000 (25 11:09 +0200)
tree865d03efacaba63191f1178231850b0869c41728
parent69340d49dc9e633aef7b290b7e41de06e2499a18
parent71e2a34192e0c777949382a0beda2b540296a4e4
Merge branch 'MDL-59578-master' of git://github.com/junpataleta/moodle