Merge branch 'MDL-61265-33' of git://github.com/sarjona/moodle into MOODLE_33_STABLE
commiteb82d420f01598636fd52ffd1eeb2ba7d7a4269e
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 19 Mar 2018 02:52:10 +0000 (19 10:52 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 19 Mar 2018 02:52:10 +0000 (19 10:52 +0800)
tree8475b513fd0abbfb71e854e9cf5e7b204db14a4a
parentbc360e9441e50261259a79d22834074e062ba4ab
parent7dc3c9b24e9a8249b4076631535762d6c076a56c
Merge branch 'MDL-61265-33' of git://github.com/sarjona/moodle into MOODLE_33_STABLE