Merge branch 'MDL-35198' of git://github.com/mouneyrac/moodle

author Sam Hemelryk <sam@moodle.com>

Tue, 16 Oct 2012 03:23:24 +0000 (11:23 +0800)

committer Sam Hemelryk <sam@moodle.com>

Tue, 16 Oct 2012 03:23:24 +0000 (11:23 +0800)
author Sam Hemelryk <sam@moodle.com>
Tue, 16 Oct 2012 03:23:24 +0000 (11:23 +0800)
committer Sam Hemelryk <sam@moodle.com>
Tue, 16 Oct 2012 03:23:24 +0000 (11:23 +0800)
diff --cc course/externallib.php
Simple merge
diff --cc enrol/externallib.php
Simple merge
diff --cc lib/adminlib.php
Simple merge
author	Sam Hemelryk <sam@moodle.com>
	Tue, 16 Oct 2012 03:23:24 +0000 (11:23 +0800)
committer	Sam Hemelryk <sam@moodle.com>
	Tue, 16 Oct 2012 03:23:24 +0000 (11:23 +0800)
		1	2
course/externallib.php	patch \|	diff1 \|	diff2 \|	blob \| history
enrol/externallib.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/adminlib.php	patch \|	diff1 \|	diff2 \|	blob \| history