Merge branch 'MDL-61020-33' of git://github.com/rezaies/moodle into MOODLE_33_STABLE
commitabf6c76dbf72d654134388caf993a1ee20699197
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 3 Apr 2018 06:21:58 +0000 (3 14:21 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 3 Apr 2018 06:21:58 +0000 (3 14:21 +0800)
treeac8da538f2dda9b5081c3dd30644d38989b413a1
parent036ab38556cb85e93e92ef23f18477e44a2ad89b
parent4b057b9d1a12b1e89ef356a930ee495db43a6cc4
Merge branch 'MDL-61020-33' of git://github.com/rezaies/moodle into MOODLE_33_STABLE