Merge branch 'MDL-55982-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 21 Sep 2016 01:04:36 +0000 (03:04 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 21 Sep 2016 01:04:36 +0000 (03:04 +0200)
commit6cc077e90fa52602f4e94bbadd57bf2fea251916
treebdbfaa0bfd86039096a5df291e5df11f190d9d1e
parent349a6430e663d17b6ff53e5a04ab831613140e6b
parent0f3bbfd4f8e85ea6e938766de79e4d25a09dedc5
Merge branch 'MDL-55982-master' of git://github.com/andrewnicols/moodle