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

Trivial merge