Merge branch 'w20_MDL-32926_m23_phpunitevil' of git://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 14 May 2012 05:36:11 +0000 (13:36 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 14 May 2012 05:36:11 +0000 (13:36 +0800)

Trivial merge