Merge branch 'w13_MDL-37782_m25_testtrans' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Mar 2013 15:09:06 +0000 (16:09 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Mar 2013 15:09:06 +0000 (16:09 +0100)

Trivial merge