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)
commit06dcb573c475a81219bd79a88d1055a38031add7
tree2d5826e35e67f4f07579620c5327031911c966f1
parentbc24339e00f540ff55ea78731e310a85679b185f
parent46cb5d9aced60a4867fb88ef5f846b1db8b1a283
Merge branch 'w18_MDL-32589_m23_proxytest' of git://github.com/skodak/moodle
lib/phpunit/bootstrap.php