Merge branch 'w18_MDL-32589_m23_proxytest' of git://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 30 Apr 2012 09:00:23 +0000 (17:00 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 30 Apr 2012 09:00:23 +0000 (17:00 +0800)
1  2 
lib/phpunit/bootstrap.php

Simple merge