Sam Hemelryk e667bd9db0 Merge branch 'MDL-39626_master' of git://github.com/kordan/moodle
Conflicts:
	theme/formal_white/style/course.css
2013-06-18 11:03:21 +12:00
..