Merge branch 'MDL-56952-master' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 15 Nov 2016 02:18:01 +0000 (10:18 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 15 Nov 2016 02:18:01 +0000 (10:18 +0800)
commit857a0ab60e036360c6222e94a33179d48b96c692
tree83d247fa8ad714317bf88e9a8f1e4f7eec174e32
parentd7978641dc28b682dcada806a5aafd006cdd1463
parent204413187ea8a0a1349594180e7d1ee01ab46621
Merge branch 'MDL-56952-master' of git://github.com/damyon/moodle