Merge branch 'w03_MDL-30929_m23_stalefiles' of https://github.com/skodak/moodle

author Aparup Banerjee <aparup@moodle.com>

Mon, 16 Jan 2012 08:15:04 +0000 (16:15 +0800)

committer Aparup Banerjee <aparup@moodle.com>

Mon, 16 Jan 2012 08:15:04 +0000 (16:15 +0800)
author Aparup Banerjee <aparup@moodle.com>
Mon, 16 Jan 2012 08:15:04 +0000 (16:15 +0800)
committer Aparup Banerjee <aparup@moodle.com>
Mon, 16 Jan 2012 08:15:04 +0000 (16:15 +0800)
diff --cc admin/renderer.php
Simple merge
diff --cc lang/en/admin.php
Simple merge
author	Aparup Banerjee <aparup@moodle.com>
	Mon, 16 Jan 2012 08:15:04 +0000 (16:15 +0800)
committer	Aparup Banerjee <aparup@moodle.com>
	Mon, 16 Jan 2012 08:15:04 +0000 (16:15 +0800)
		1	2
admin/renderer.php	patch \|	diff1 \|	diff2 \|	blob \| history
lang/en/admin.php	patch \|	diff1 \|	diff2 \|	blob \| history