Merge branch 'MDL-25881' of git://git.luns.net.uk/moodle
authorPetr Skoda <commits@skodak.org>
Mon, 17 Jan 2011 18:12:33 +0000 (19:12 +0100)
committerPetr Skoda <commits@skodak.org>
Mon, 17 Jan 2011 18:12:33 +0000 (19:12 +0100)

Trivial merge