Merge branch 'MDL-37997-muc-stats-display' of git://github.com/mudrd8mz/moodle

author Dan Poltawski <dan@moodle.com>

Mon, 18 Feb 2013 08:17:06 +0000 (16:17 +0800)

committer Dan Poltawski <dan@moodle.com>

Mon, 18 Feb 2013 08:17:06 +0000 (16:17 +0800)
author Dan Poltawski <dan@moodle.com>
Mon, 18 Feb 2013 08:17:06 +0000 (16:17 +0800)
committer Dan Poltawski <dan@moodle.com>
Mon, 18 Feb 2013 08:17:06 +0000 (16:17 +0800)
diff --cc lib/moodlelib.php
Simple merge
diff --cc theme/base/style/core.css
Simple merge
author	Dan Poltawski <dan@moodle.com>
	Mon, 18 Feb 2013 08:17:06 +0000 (16:17 +0800)
committer	Dan Poltawski <dan@moodle.com>
	Mon, 18 Feb 2013 08:17:06 +0000 (16:17 +0800)
		1	2
lib/moodlelib.php	patch \|	diff1 \|	diff2 \|	blob \| history
theme/base/style/core.css	patch \|	diff1 \|	diff2 \|	blob \| history