Merge branch 's7_MDL-9376_qaforum' of git://github.com/dongsheng/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Mar 2011 00:22:10 +0000 (01:22 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Mar 2011 00:22:10 +0000 (01:22 +0100)

Trivial merge