Merge branch 'MDL-46295-master' of git://github.com/damyon/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 6 Oct 2014 21:36:48 +0000 (10:36 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 6 Oct 2014 21:36:48 +0000 (10:36 +1300)
commit3ba4e595fb5cffd6cd7f486521a063dea6dfe0b6
treee5740a190cfe804b71c6a2779fe149b6b0cd4dd2
parentf46606936ab73e394b6bcf42663ad1fed766cca4
parentcc6b20fbc810e6bd21dc3fcbfa8f40f64eed7022
Merge branch 'MDL-46295-master' of git://github.com/damyon/moodle