Merge branch 'MDL-26267' of git://github.com/samhemelryk/moodle
authorPetr Skoda <commits@skodak.org>
Mon, 7 Feb 2011 22:07:16 +0000 (23:07 +0100)
committerPetr Skoda <commits@skodak.org>
Mon, 7 Feb 2011 22:07:16 +0000 (23:07 +0100)

Trivial merge