Merge branch 'MDL-41592_master' of https://github.com/dmonllao/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 3 Dec 2013 22:52:12 +0000 (11:52 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 3 Dec 2013 22:52:12 +0000 (11:52 +1300)
1  2 
config-dist.php
lib/behat/lib.php
lib/setup.php
lib/setuplib.php

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