Merge branch 'MDL-25675' of git://git.luns.net.uk/moodle
authorPetr Skoda <commits@skodak.org>
Mon, 10 Jan 2011 13:34:18 +0000 (14:34 +0100)
committerPetr Skoda <commits@skodak.org>
Mon, 10 Jan 2011 13:34:18 +0000 (14:34 +0100)

Trivial merge