Merge branch 'MDL-56301-master' of https://github.com/snake/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 6 Dec 2016 06:10:40 +0000 (14:10 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 6 Dec 2016 06:10:40 +0000 (14:10 +0800)
commit7586a360226042a50ccf1a70625a4acc2c4945c5
tree3cc00d712d16bf3692feba9099fb108a11dd64d4
parent5b67c9ecd173a51c640b93cbaae5b58fc81b47fe
parent4fc74fe587dc9412a95d79ce8eb7821ffb33dde6
Merge branch 'MDL-56301-master' of https://github.com/snake/moodle