Merge branch 'MDL-53982-master' of https://github.com/FMCorz/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 3 May 2016 06:26:50 +0000 (14:26 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 3 May 2016 06:26:50 +0000 (14:26 +0800)
commitd0ec347a760a33c0d2df53e4187881b4928c2c27
tree3fa0fa9b3c56bcce0466f26a6fdddc0dccd431af
parentbfb122a10a940a97b7906f4ea967629feb6864dc
parent60011d9a8a220daccc748c23c5344838d2a26ae0
Merge branch 'MDL-53982-master' of https://github.com/FMCorz/moodle