Merge branch 'm20_MDL-25219_question_text' of git://github.com/dongsheng/moodle
authorPetr Skoda <commits@skodak.org>
Mon, 10 Jan 2011 13:44:26 +0000 (14:44 +0100)
committerPetr Skoda <commits@skodak.org>
Mon, 10 Jan 2011 13:44:26 +0000 (14:44 +0100)

Trivial merge