Merge branch 'MDL-25780' of git://git.luns.net.uk/moodle
authorPetr Skoda <commits@skodak.org>
Mon, 7 Feb 2011 20:49:32 +0000 (21:49 +0100)
committerPetr Skoda <commits@skodak.org>
Mon, 7 Feb 2011 20:49:32 +0000 (21:49 +0100)

Trivial merge