Merge branch 'MDL-37458_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 21 Jan 2013 03:14:38 +0000 (11:14 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 21 Jan 2013 03:14:38 +0000 (11:14 +0800)
1  2 
lib/phpunit/bootstrap.php
lib/phpunit/classes/util.php
lib/setup.php

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