Merge branch 'w13_MDL-38581_m25_forumtests' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 24 Mar 2013 22:26:55 +0000 (23:26 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 24 Mar 2013 22:26:55 +0000 (23:26 +0100)

Trivial merge