Merge branch 'wip-MDL-56869-master' of https://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 17 Nov 2016 11:32:49 +0000 (11:32 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 17 Nov 2016 11:32:49 +0000 (11:32 +0000)
commitabdffed5fcac9f571bf974ef2b10648c60a9f2e1
treef0d139da5a6429ff18877285fa3ae3da6bc46769
parent486fac73f27ff9420425d862001306516fdbc2a3
parentd76dd4d064844c1c0073079069749e01c8255dd6
Merge branch 'wip-MDL-56869-master' of https://github.com/marinaglancy/moodle