Merge branch 'MDL-26177' of git://github.com/timhunt/moodle
authorPetr Skoda <commits@skodak.org>
Mon, 31 Jan 2011 08:36:15 +0000 (09:36 +0100)
committerPetr Skoda <commits@skodak.org>
Mon, 31 Jan 2011 08:36:15 +0000 (09:36 +0100)

Trivial merge