Merge branch 'MDL-56576_master-fix' of git://github.com/dmonllao/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 4 Nov 2016 00:28:08 +0000 (08:28 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 4 Nov 2016 00:28:08 +0000 (08:28 +0800)
commitda31fc5bff824923d32d9cf6e134366d5f0b670e
tree048e71d9dceb4392ace9e041d04525f4f7beb9dd
parente1074d6ffd49f3770d4d8e65959525fb7cf871c7
parent629d3e5770d37456e6cf07a6ff500ad9ec196dc9
Merge branch 'MDL-56576_master-fix' of git://github.com/dmonllao/moodle