Merge branch 'wip-MDL-42577-master' of git://github.com/marinaglancy/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 4 Nov 2013 06:24:46 +0000 (14:24 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 4 Nov 2013 06:24:46 +0000 (14:24 +0800)
commit8e23283cbbbfa761299cbafecb8e681bea0b21d5
treee15618be81e8f9e68a81131bf16fa52338f119f2
parent197ab6efefdf2a95f272065372d6ece916d9bc23
parente58a30f9e85fa0d029d0f083e1b8beb93ae8276b
Merge branch 'wip-MDL-42577-master' of git://github.com/marinaglancy/moodle