Merge branch 'MDL-58220-master-fix1' of http://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 4 Apr 2017 05:54:07 +0000 (06:54 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 4 Apr 2017 05:54:07 +0000 (06:54 +0100)
commitdda4dcaffbd3eed2679339eb16326a7038d99e0f
treee89574de72a757ca95a9c77bae93c3c99f58780b
parent930cab683d5bc5f9dab6f835bcb71fa464329248
parentd37945c37a8d59f104cdbd0853f79f55a67d6466
Merge branch 'MDL-58220-master-fix1' of github.com/damyon/moodle