Merge branch 'MDL-41090_rebased' of https://github.com/andrewhancox/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 15 Jan 2018 14:52:29 +0000 (15:52 +0100)
committerDavid Monllao <davidm@moodle.com>
Mon, 15 Jan 2018 14:52:29 +0000 (15:52 +0100)
commitf4a30c5fdfb12d656363cc3ac41309cc272de740
treefecc7b290b4d10bbecd5c9e64a6ada385ce540d8
parent2692af90323f717b164739fab55c20412538491e
parentf3d9872aa32072585311ef69012fadb1a35100d1
Merge branch 'MDL-41090_rebased' of https://github.com/andrewhancox/moodle