Merge branch 'MDL-25596-fixed' of git://github.com/samhemelryk/moodle
authorPetr Skoda <commits@skodak.org>
Wed, 12 Jan 2011 08:57:18 +0000 (09:57 +0100)
committerPetr Skoda <commits@skodak.org>
Wed, 12 Jan 2011 08:57:18 +0000 (09:57 +0100)

Trivial merge