Merge branch 'MDL-57572-master' of https://github.com/mwehr/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Jan 2017 18:25:44 +0000 (19:25 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Jan 2017 18:25:44 +0000 (19:25 +0100)
commit7bdbad80d87ff344a893dda0b924ae27a53f3fa4
tree781b5e633b698981e9773e2187f3bf3c2ae90840
parent96733b06d634a25dd6ee215aa7447db167631587
parent9c860cea46cb3cec9aa4b271c02aa71c4006c9f6
Merge branch 'MDL-57572-master' of https://github.com/mwehr/moodle