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)
commit7a3f9421cb397ffd06621c3c8e8d3b3c785b2be0
tree4e92d3cefe306e610e3ffa78c057809f73051c42
parentc31909cb69f050ba6492291d04e1b98d24dedd6f
parent64a8058e18cf4c26b6119f9a75dec5ced3e98ffc
Merge branch 'w30_MDL-40545_m26_localcachedir' of https://github.com/skodak/moodle
admin/tool/behat/cli/util.php
config-dist.php
lib/setup.php
lib/upgrade.txt