Merge branch 'master_MDL-38019' of git://github.com/andyjdavis/moodle

author Sam Hemelryk <sam@moodle.com>

Tue, 11 Jun 2013 21:34:06 +0000 (09:34 +1200)

committer Sam Hemelryk <sam@moodle.com>

Tue, 11 Jun 2013 21:34:06 +0000 (09:34 +1200)
author Sam Hemelryk <sam@moodle.com>
Tue, 11 Jun 2013 21:34:06 +0000 (09:34 +1200)
committer Sam Hemelryk <sam@moodle.com>
Tue, 11 Jun 2013 21:34:06 +0000 (09:34 +1200)
diff --cc lib/adminlib.php
Simple merge
diff --cc lib/datalib.php
Simple merge
diff --cc lib/filterlib.php
Simple merge
author	Sam Hemelryk <sam@moodle.com>
	Tue, 11 Jun 2013 21:34:06 +0000 (09:34 +1200)
committer	Sam Hemelryk <sam@moodle.com>
	Tue, 11 Jun 2013 21:34:06 +0000 (09:34 +1200)
		1	2
lib/adminlib.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/datalib.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/filterlib.php	patch \|	diff1 \|	diff2 \|	blob \| history