Merge branch 'MDL-58919-master-fix1' of https://github.com/snake/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 21 Jun 2017 09:22:11 +0000 (10:22 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 21 Jun 2017 09:22:11 +0000 (10:22 +0100)
commit8c0b1ec32b78ad0a0ea0b79ff8376f736d101f05
treea24ebe7579cbae9a70a1c0f8e1b4b4fef4081f55
parent34e2b1f92d9bc071fe62efd1e2a5949dc5340cd6
parentc6b32acdb15751698653f2897906c7cea1d0a87c
Merge branch 'MDL-58919-master-fix1' of https://github.com/snake/moodle