Merge branch 'MDL-50993-master' of git://github.com/ryanwyllie/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 19 Oct 2015 04:43:40 +0000 (12:43 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 19 Oct 2015 04:43:40 +0000 (12:43 +0800)
commitc95ba7faa819ee249c98fff9de3166c867119240
treeaae733fd3be868db65cbe3bb7e93c5f4a2debc4e
parent84d5eef4ad03084300e9898ead72ee38b643ff20
parent1e36665719ccd28e214f39fda2c4a7c3967e49b8
Merge branch 'MDL-50993-master' of git://github.com/ryanwyllie/moodle