Merge branch 'MDL-55345' of https://github.com/paulholden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 11 Oct 2016 15:06:17 +0000 (17:06 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 11 Oct 2016 15:06:17 +0000 (17:06 +0200)
commita34625a17c11694eb0568158c32a7b1675be579f
tree3a12ace425a51c09dc78fcb729488c9672d2b351
parent412a4a6d8b3003ee8aa698c33520a60280e31cf7
parent546bc40c138e2243966b1e1a7802cc455a92cff8
Merge branch 'MDL-55345' of https://github.com/paulholden/moodle