Merge branch 'mdl-56831-master' of https://github.com/Dagefoerde/moodle
commit585ba846dad117a1211c7bff73c0051051f381a8
authorDan Poltawski <dan@moodle.com>
Mon, 14 Nov 2016 13:21:35 +0000 (14 13:21 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 14 Nov 2016 13:21:35 +0000 (14 13:21 +0000)
tree7d92ee87df3bf8dea1a0a87b30ee68ab4f6c5757
parent55e54953a4fba1343faabecfbfaf22f2f65f06c8
parentc2e123355d3cb2c3dd55ae66cff0f89ede56bf0a
Merge branch 'mdl-56831-master' of https://github.com/Dagefoerde/moodle