Merge branch 'wip-MDL-42379-master' of git://github.com/abgreeve/moodle
commit9620bcebee54514f267607871cd6570fe0138504
authorSam Hemelryk <sam@moodle.com>
Wed, 30 Oct 2013 08:00:30 +0000 (30 16:00 +0800)
committerSam Hemelryk <sam@moodle.com>
Fri, 1 Nov 2013 00:55:26 +0000 (1 08:55 +0800)
tree4bbcc21721d6c23d6463295535122d05ff982588
parent574c1699a7851758f35b1fb45b003bf2d5e3e320
parent222e0a00450fb5146f4459308aa84fa4e3b40a62
Merge branch 'wip-MDL-42379-master' of git://github.com/abgreeve/moodle