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

Trivial merge