Merge branch 'MDL-37458_master' of git://github.com/dmonllao/moodle

author Dan Poltawski <dan@moodle.com>

Mon, 21 Jan 2013 03:14:38 +0000 (11:14 +0800)

committer Dan Poltawski <dan@moodle.com>

Mon, 21 Jan 2013 03:14:38 +0000 (11:14 +0800)
author Dan Poltawski <dan@moodle.com>
Mon, 21 Jan 2013 03:14:38 +0000 (11:14 +0800)
committer Dan Poltawski <dan@moodle.com>
Mon, 21 Jan 2013 03:14:38 +0000 (11:14 +0800)
diff --cc lib/phpunit/bootstrap.php
Simple merge
diff --cc lib/phpunit/classes/util.php
Simple merge
diff --cc lib/setup.php
Simple merge
author	Dan Poltawski <dan@moodle.com>
	Mon, 21 Jan 2013 03:14:38 +0000 (11:14 +0800)
committer	Dan Poltawski <dan@moodle.com>
	Mon, 21 Jan 2013 03:14:38 +0000 (11:14 +0800)
		1	2
lib/phpunit/bootstrap.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/phpunit/classes/util.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/setup.php	patch \|	diff1 \|	diff2 \|	blob \| history