Merge branch 'w20_MDL-32961_m23_phpunitperf' of git://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 17 May 2012 04:35:45 +0000 (12:35 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 17 May 2012 04:35:45 +0000 (12:35 +0800)

Trivial merge