Merge branch 'MDL-28574-master' of https://github.com/xow/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 1 Aug 2017 01:59:59 +0000 (09:59 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 1 Aug 2017 01:59:59 +0000 (09:59 +0800)
commit13822dca0772cd36144e0464c74da060bd93c9ef
treebb2ca14bf143a5caed59bfd2b1a30479a27dc830
parenta79e84e06076e30d63822ad1e82fc0683a3afff2
parent72e688d7ff6f08cd9c76c1185c8174cae1fdcf97
Merge branch 'MDL-28574-master' of https://github.com/xow/moodle