Damyon Wiese 5a10d2a7ae Merge branch 'wip-mdl-40043' of git://github.com/rajeshtaneja/moodle
Conflicts:
	course/tests/courselib_test.php
	lang/en/moodle.php
2013-08-20 14:40:42 +08:00
..