Merge branch 'w32_MDL-40901_m26_phpunitcleanup2' of https://github.com/skodak/moodle

author Sam Hemelryk <sam@moodle.com>

Mon, 5 Aug 2013 20:53:24 +0000 (08:53 +1200)

committer Sam Hemelryk <sam@moodle.com>

Mon, 5 Aug 2013 20:53:24 +0000 (08:53 +1200)
author Sam Hemelryk <sam@moodle.com>
Mon, 5 Aug 2013 20:53:24 +0000 (08:53 +1200)
committer Sam Hemelryk <sam@moodle.com>
Mon, 5 Aug 2013 20:53:24 +0000 (08:53 +1200)
diff --cc auth/tests/auth_test.php
Simple merge
diff --cc lib/tests/accesslib_test.php
Simple merge
author	Sam Hemelryk <sam@moodle.com>
	Mon, 5 Aug 2013 20:53:24 +0000 (08:53 +1200)
committer	Sam Hemelryk <sam@moodle.com>
	Mon, 5 Aug 2013 20:53:24 +0000 (08:53 +1200)
		1	2
auth/tests/auth_test.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/tests/accesslib_test.php	patch \|	diff1 \|	diff2 \|	blob \| history