Merge branch 'w16_MDL-32400_m23_phpunit4' of git://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 16 Apr 2012 08:12:35 +0000 (16:12 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 16 Apr 2012 08:12:35 +0000 (16:12 +0800)
commit54e4d1b3a1215e7fbf0982aec72f05d694df71d3
tree56cd5f1a9589503af50e85d7f7db8656e5b4f9a7
parentaa4ebbe5f7fc59f253af4d52e20e3582973bded9
parent6b04fdc0b6abac8ca0118671cba48d9c718b6b5b
Merge branch 'w16_MDL-32400_m23_phpunit4' of git://github.com/skodak/moodle
lib/phpunit/generatorlib.php
mod/page/lib.php