Merge branch 'MDL-58490-master' of git://github.com/lameze/moodle
[moodle.git] / blocks / index.html