From: Andrew Nicols Date: Wed, 5 Apr 2017 07:19:58 +0000 (+0800) Subject: Merge branch 'MDL-58361-master' of https://github.com/xow/moodle X-Git-Tag: v3.3.0-beta~148^2~1 X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=c254588732175ea8d2f17ee365adce44d18e6252 Merge branch 'MDL-58361-master' of https://github.com/xow/moodle --- c254588732175ea8d2f17ee365adce44d18e6252