Merge branch 'w13_MDL-38627_m25_byteservingstop' of git://github.com/skodak/moodle

author Damyon Wiese <damyon@moodle.com>

Wed, 3 Apr 2013 07:48:35 +0000 (15:48 +0800)

committer Damyon Wiese <damyon@moodle.com>

Wed, 3 Apr 2013 07:48:35 +0000 (15:48 +0800)
author Damyon Wiese <damyon@moodle.com>
Wed, 3 Apr 2013 07:48:35 +0000 (15:48 +0800)
committer Damyon Wiese <damyon@moodle.com>
Wed, 3 Apr 2013 07:48:35 +0000 (15:48 +0800)
diff --cc lib/moodlelib.php
Simple merge
diff --cc lib/outputrenderers.php
Simple merge
author	Damyon Wiese <damyon@moodle.com>
	Wed, 3 Apr 2013 07:48:35 +0000 (15:48 +0800)
committer	Damyon Wiese <damyon@moodle.com>
	Wed, 3 Apr 2013 07:48:35 +0000 (15:48 +0800)
		1	2
lib/moodlelib.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/outputrenderers.php	patch \|	diff1 \|	diff2 \|	blob \| history