Merge branch 'MDL-39441_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 22 Jul 2013 02:45:42 +0000 (10:45 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 22 Jul 2013 02:45:42 +0000 (10:45 +0800)
1  2 
admin/tool/behat/cli/util.php
lib/setup.php

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