Merge branch 'MDL-57690-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Jan 2017 19:22:44 +0000 (20:22 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Jan 2017 19:22:44 +0000 (20:22 +0100)
commit0396389272cdb085a21783c777f6112cad0bb383
treea4701900978839dc371b32fa03da840b363171a7
parent0db24a200a42c44500061db60aceab83ff6ee8da
parent935584aaba164c0d1b1574978e4aa7c5b4dd0437
Merge branch 'MDL-57690-master' of git://github.com/danpoltawski/moodle