Merge branch 'MDL-57265' of git://github.com/stronk7/moodle
commit8c71e91cdb0044dc54d88e229f0ed4358c5913c1
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 5 Dec 2016 00:51:21 +0000 (5 08:51 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 5 Dec 2016 00:51:21 +0000 (5 08:51 +0800)
tree2589bc0702b58a44af3cb46725a94cd44fa49ee9
parente6cb76dfbbd04a41a347711c8da85a9dba5c6c5a
parent73ddcea6e931347741a8e517c80de9424a2cff08
Merge branch 'MDL-57265' of git://github.com/stronk7/moodle