Merge branch 'wip-MDL-40426-master' of git://github.com/abgreeve/moodle

author Marina Glancy <marina@moodle.com>

Tue, 16 Jul 2013 03:48:27 +0000 (13:48 +1000)

committer Marina Glancy <marina@moodle.com>

Tue, 16 Jul 2013 03:48:27 +0000 (13:48 +1000)
author Marina Glancy <marina@moodle.com>
Tue, 16 Jul 2013 03:48:27 +0000 (13:48 +1000)
committer Marina Glancy <marina@moodle.com>
Tue, 16 Jul 2013 03:48:27 +0000 (13:48 +1000)
diff --cc lib/accesslib.php
Simple merge
diff --cc lib/moodlelib.php
Simple merge
author	Marina Glancy <marina@moodle.com>
	Tue, 16 Jul 2013 03:48:27 +0000 (13:48 +1000)
committer	Marina Glancy <marina@moodle.com>
	Tue, 16 Jul 2013 03:48:27 +0000 (13:48 +1000)
		1	2
lib/accesslib.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/moodlelib.php	patch \|	diff1 \|	diff2 \|	blob \| history