Merge branch 'w02_MDL-36898_m25_ccontact' of git://github.com/skodak/moodle

author Dan Poltawski <dan@moodle.com>

Tue, 15 Jan 2013 05:57:39 +0000 (13:57 +0800)

committer Dan Poltawski <dan@moodle.com>

Tue, 15 Jan 2013 05:57:39 +0000 (13:57 +0800)
author Dan Poltawski <dan@moodle.com>
Tue, 15 Jan 2013 05:57:39 +0000 (13:57 +0800)
committer Dan Poltawski <dan@moodle.com>
Tue, 15 Jan 2013 05:57:39 +0000 (13:57 +0800)
diff --cc course/renderer.php
Simple merge
diff --cc lib/accesslib.php
Simple merge
author	Dan Poltawski <dan@moodle.com>
	Tue, 15 Jan 2013 05:57:39 +0000 (13:57 +0800)
committer	Dan Poltawski <dan@moodle.com>
	Tue, 15 Jan 2013 05:57:39 +0000 (13:57 +0800)
		1	2
course/renderer.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/accesslib.php	patch \|	diff1 \|	diff2 \|	blob \| history