Merge branch 'MDL-26887' of git://github.com/timhunt/moodle
authorPetr Skoda <commits@skodak.org>
Mon, 21 Mar 2011 14:39:31 +0000 (15:39 +0100)
committerPetr Skoda <commits@skodak.org>
Mon, 21 Mar 2011 14:39:31 +0000 (15:39 +0100)

Trivial merge