Merge branch 'MDL-60764' of git://github.com/stronk7/moodle
authorDavid Monllao <davidm@moodle.com>
Fri, 10 Nov 2017 09:20:25 +0000 (10:20 +0100)
committerDavid Monllao <davidm@moodle.com>
Fri, 10 Nov 2017 09:20:25 +0000 (10:20 +0100)
commit08641175b33bb8613d30a79f2f2286009cef7aff
treebf0da6b9d81fdeb10cbc22377e1e979276db8f94
parentf738fc8efd0f5c4b961dbb0a30def6184dd406d5
parent66aee746e3daa61c367a0d9a4ee377a5582aaa63
Merge branch 'MDL-60764' of git://github.com/stronk7/moodle