Merge branch 'm20_MDL-25468_coding_error' of git://github.com/dongsheng/moodle
authorPetr Skoda <commits@skodak.org>
Mon, 7 Feb 2011 20:37:16 +0000 (21:37 +0100)
committerPetr Skoda <commits@skodak.org>
Mon, 7 Feb 2011 20:37:16 +0000 (21:37 +0100)

Trivial merge