Merge branch 'MDL-36316-master' of git://github.com/danpoltawski/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 16 Sep 2013 01:13:41 +0000 (13:13 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 16 Sep 2013 01:13:41 +0000 (13:13 +1200)
1  2 
grade/report/grader/lib.php
lib/filelib.php
theme/bootstrapbase/config.php

Simple merge
diff --cc lib/filelib.php
Simple merge
Simple merge