Merge branch 'w12_MDL-38364_m25_phpunitloading' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Mar 2013 23:17:35 +0000 (00:17 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Mar 2013 23:17:35 +0000 (00:17 +0100)

Trivial merge