Merge branch 'MDL-57728_m33v1' of https://github.com/sbourget/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 31 Jan 2017 08:28:15 +0000 (08:28 +0000)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 1 Feb 2017 05:01:24 +0000 (13:01 +0800)
commitf17eb367711a32274830aefba1a0d202e8be41f9
treea60206a27b304f3bd910de898b9026260c6131f8
parent22f93579fa7c08e13705f3170dff7cbade0f33ea
parentcb0bc477e279cb5049a5909170228344b25f1d98
Merge branch 'MDL-57728_m33v1' of https://github.com/sbourget/moodle