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

Trivial merge