Merge branch 'MDL-24355_emergency_21' of git://github.com/stronk7/moodle
authorPetr Skoda <commits@skodak.org>
Wed, 13 Apr 2011 14:48:38 +0000 (16:48 +0200)
committerPetr Skoda <commits@skodak.org>
Wed, 13 Apr 2011 14:48:38 +0000 (16:48 +0200)

Trivial merge