Merge branch 'w13_MDL-37783_m12_testinfo' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Mar 2013 22:13:33 +0000 (23:13 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Mar 2013 22:13:33 +0000 (23:13 +0100)

Trivial merge