Merge branch 'MDL-28471' of git://github.com/timhunt/moodle
authorPetr Skoda <commits@skodak.org>
Tue, 2 Aug 2011 14:35:09 +0000 (16:35 +0200)
committerPetr Skoda <commits@skodak.org>
Tue, 2 Aug 2011 14:35:09 +0000 (16:35 +0200)

Trivial merge