Merge branch 'MDL-43230-master' of git://github.com/ryanwyllie/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Oct 2016 20:35:53 +0000 (22:35 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Oct 2016 20:35:53 +0000 (22:35 +0200)
commit8c88830a43c452ced71b7b74ff9a1677b1501a6a
tree19eefa7de8727fe62ed358c3a82f670f786faa45
parentffe9505d2bd0009a59fce91df4359cfe40224130
parent2e39117f75f3ab3fd2617013500140393986405c
Merge branch 'MDL-43230-master' of git://github.com/ryanwyllie/moodle