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

Trivial merge