Merge branch 'MDL-52560-m' of https://github.com/micaherne/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 12 Jan 2016 06:46:31 +0000 (14:46 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 12 Jan 2016 09:31:08 +0000 (09:31 +0000)
commit0755d638d73408aed3e5597b06069a1907d264e5
tree5a3f4eef2ba9ceee191beb25ab7edd4124aacb91
parentc7198e2a0ea7db5823b9b5b4961e3e303124e01d
parent189875242e7225d5e5e41630f526dcdb8e9911af
Merge branch 'MDL-52560-m' of https://github.com/micaherne/moodle