Merge branch 'w18_MDL-32651_m23_phpunit6' of git://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 30 Apr 2012 01:16:24 +0000 (09:16 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 30 Apr 2012 01:16:24 +0000 (09:16 +0800)

Trivial merge