Merge branch 'MDL-39957_master' of https://github.com/markn86/moodle

author Dan Poltawski <dan@moodle.com>

Tue, 20 Aug 2013 04:38:08 +0000 (12:38 +0800)

committer Dan Poltawski <dan@moodle.com>

Tue, 20 Aug 2013 04:38:08 +0000 (12:38 +0800)
author Dan Poltawski <dan@moodle.com>
Tue, 20 Aug 2013 04:38:08 +0000 (12:38 +0800)
committer Dan Poltawski <dan@moodle.com>
Tue, 20 Aug 2013 04:38:08 +0000 (12:38 +0800)
diff --cc course/lib.php
Simple merge
diff --cc lang/en/moodle.php
Simple merge
diff --cc lib/moodlelib.php
Simple merge
author	Dan Poltawski <dan@moodle.com>
	Tue, 20 Aug 2013 04:38:08 +0000 (12:38 +0800)
committer	Dan Poltawski <dan@moodle.com>
	Tue, 20 Aug 2013 04:38:08 +0000 (12:38 +0800)
		1	2
course/lib.php	patch \|	diff1 \|	diff2 \|	blob \| history
lang/en/moodle.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/moodlelib.php	patch \|	diff1 \|	diff2 \|	blob \| history