Merge branch 'MDL-28338' of git://github.com/timhunt/moodle
authorPetr Skoda <commits@skodak.org>
Tue, 2 Aug 2011 13:08:05 +0000 (15:08 +0200)
committerPetr Skoda <commits@skodak.org>
Tue, 2 Aug 2011 13:08:05 +0000 (15:08 +0200)

Trivial merge