Merge branch 'wip-MDL-25290-m24-compact' of git://github.com/samhemelryk/moodle

author Eloy Lafuente (stronk7) <stronk7@moodle.org>

Sun, 14 Oct 2012 21:32:40 +0000 (23:32 +0200)

committer Eloy Lafuente (stronk7) <stronk7@moodle.org>

Sun, 14 Oct 2012 21:32:40 +0000 (23:32 +0200)
author Eloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 14 Oct 2012 21:32:40 +0000 (23:32 +0200)
committer Eloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 14 Oct 2012 21:32:40 +0000 (23:32 +0200)
diff --cc config-dist.php
Simple merge
diff --cc lib/phpunit/classes/util.php
Simple merge
author	Eloy Lafuente (stronk7) <stronk7@moodle.org>
	Sun, 14 Oct 2012 21:32:40 +0000 (23:32 +0200)
committer	Eloy Lafuente (stronk7) <stronk7@moodle.org>
	Sun, 14 Oct 2012 21:32:40 +0000 (23:32 +0200)
		1	2
config-dist.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/phpunit/classes/util.php	patch \|	diff1 \|	diff2 \|	blob \| history