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

Trivial merge