Merge branch 'MDL-56810_master' of https://github.com/Syxton/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 13 Dec 2016 14:55:50 +0000 (14:55 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 13 Dec 2016 14:55:50 +0000 (14:55 +0000)
commitae2bf1626cea207715b3ba20b54044b76904ded5
treeae1bd8454a1c5634b87ef0bc887cee02bb8a146c
parentab73c1ddbb6b38c7897bd4e2dfb83d374ad5bf46
parent6be2b79b9c0f06aa46ebe7bcbef06ec11c5db7c7
Merge branch 'MDL-56810_master' of https://github.com/Syxton/moodle