Merge branch 'MDL-36316-master' of git://github.com/danpoltawski/moodle

author Sam Hemelryk <sam@moodle.com>

Mon, 16 Sep 2013 01:13:41 +0000 (13:13 +1200)

committer Sam Hemelryk <sam@moodle.com>

Mon, 16 Sep 2013 01:13:41 +0000 (13:13 +1200)
author Sam Hemelryk <sam@moodle.com>
Mon, 16 Sep 2013 01:13:41 +0000 (13:13 +1200)
committer Sam Hemelryk <sam@moodle.com>
Mon, 16 Sep 2013 01:13:41 +0000 (13:13 +1200)
diff --cc grade/report/grader/lib.php
Simple merge
diff --cc lib/filelib.php
Simple merge
diff --cc theme/bootstrapbase/config.php
Simple merge
author	Sam Hemelryk <sam@moodle.com>
	Mon, 16 Sep 2013 01:13:41 +0000 (13:13 +1200)
committer	Sam Hemelryk <sam@moodle.com>
	Mon, 16 Sep 2013 01:13:41 +0000 (13:13 +1200)
		1	2
grade/report/grader/lib.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/filelib.php	patch \|	diff1 \|	diff2 \|	blob \| history
theme/bootstrapbase/config.php	patch \|	diff1 \|	diff2 \|	blob \| history