Merge branch 'MDL-25808' of git://git.luns.net.uk/moodle
authorPetr Skoda <commits@skodak.org>
Mon, 3 Jan 2011 16:59:53 +0000 (17:59 +0100)
committerPetr Skoda <commits@skodak.org>
Mon, 3 Jan 2011 16:59:53 +0000 (17:59 +0100)

Trivial merge