Merge branch 'w23_MDL-33595_m23_phpunitinit' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 8 Jun 2012 17:32:26 +0000 (19:32 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 8 Jun 2012 17:32:26 +0000 (19:32 +0200)

Trivial merge