Merge branch 'w30_MDL-40545_m26_localcachedir' of https://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 22 Jul 2013 07:47:48 +0000 (15:47 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 22 Jul 2013 07:47:48 +0000 (15:47 +0800)
1  2 
admin/tool/behat/cli/util.php
config-dist.php
lib/setup.php
lib/upgrade.txt

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