Merge branch 'MDL-43839_clean_default3' of https://github.com/andyjdavis/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 23 Mar 2014 21:26:20 +0000 (10:26 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 23 Mar 2014 21:26:20 +0000 (10:26 +1300)
1  2 
lib/installlib.php
lib/setup.php

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