Merge branch 'MDL-56228-master' of https://github.com/snake/moodle
commitdcd5c7cd1b44d2dda0b900d16ec8e1524e122edf
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 11 Oct 2016 00:02:23 +0000 (11 02:02 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 11 Oct 2016 00:02:23 +0000 (11 02:02 +0200)
tree28b88a020138500b6f2f5d6c0883691d57dad7d9
parent6bf8e9b021b4fd0482fc85db6723e6348d241e68
parent4c1bc2422d43c01fb7110c303fd00b15f29faa9f
Merge branch 'MDL-56228-master' of https://github.com/snake/moodle