Damyon Wiese 9e16402727 Merge branch '42629-26' of git://github.com/samhemelryk/moodle
Conflicts:
	course/classes/management_renderer.php
2013-11-05 14:04:08 +08:00
..