Merge branch 'MDL-51228-master' of https://github.com/dthies/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 6 Oct 2015 05:39:36 +0000 (13:39 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 6 Oct 2015 15:31:34 +0000 (16:31 +0100)
commited845fa7feda8af58eeb1d58af0fe6acd697d5d0
treef0a0ec00c87b3abe038510094e39da69fec470e0
parent0e30fbd1c886d418ab77e9df65328c6844ee52ec
parentd0ec31716b0f843d960275aec43d4c48f1b6a305
Merge branch 'MDL-51228-master' of https://github.com/dthies/moodle