Merge branch 'MDL-40442-master' of git://github.com/danpoltawski/moodle
commitac1f81a187f962566edab06698cfaead08ad1896
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 13 Oct 2015 01:45:41 +0000 (13 09:45 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 13 Oct 2015 01:45:41 +0000 (13 09:45 +0800)
treee0f3b93e80bc141eafa4d246c1b88a4a70a9d192
parent8775bc4d40d3ae0f5a6d4ceb0dd5715e75716eba
parent038152026210d527724c81619c77005b4cc4abbd
Merge branch 'MDL-40442-master' of git://github.com/danpoltawski/moodle