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

Trivial merge