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

Trivial merge