Merge branch 'MDL-25791' of git://github.com/samhemelryk/moodle
authorPetr Skoda <commits@skodak.org>
Mon, 17 Jan 2011 19:52:31 +0000 (20:52 +0100)
committerPetr Skoda <commits@skodak.org>
Mon, 17 Jan 2011 19:52:31 +0000 (20:52 +0100)

Trivial merge