Merge branch 'MDL-55322-master' of https://github.com/snake/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Aug 2016 22:12:10 +0000 (00:12 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Aug 2016 22:12:10 +0000 (00:12 +0200)
commitdffeff0a4b79190bd7d6fb3fc688fad7c1161432
tree2a2173067cf2d46f4f9da2458eceb865696ace92
parent5fe1db394b0594a64350af8228a436147afe4a09
parent243ddbcf50755677a196a6180d28f3bf73486da0
Merge branch 'MDL-55322-master' of https://github.com/snake/moodle