Merge branch 'MDL-57604-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Jan 2017 23:16:53 +0000 (00:16 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 18 Jan 2017 00:10:45 +0000 (01:10 +0100)
commit36102596d748215adad3ec67aa37dedfeea1fed4
tree11ce5dc8e5fc62d9329836db794a205eab126a93
parent2156bb454cd6e52f5cf619d8cd313f4202118b8b
parent76bab368965add7e6d6df1a02ee328c5d260efe8
Merge branch 'MDL-57604-master' of git://github.com/danpoltawski/moodle