Merge branch 'MDL-56785-master-fix' of https://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 15 Nov 2016 06:02:43 +0000 (14:02 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 15 Nov 2016 09:07:40 +0000 (09:07 +0000)
commit1e9f38a4874ccd2eaa52966fcf1d5e67a05b2136
tree87039f6654b7540e602f84de4bd6cc7354e3af9d
parent813afc679783b10b48db4debd13ca47c46f6325a
parentc1584e154cefd3927a1fac092371c9441743ae02
Merge branch 'MDL-56785-master-fix' of https://github.com/lameze/moodle