Merge branch 'MDL-25987' of git://github.com/timhunt/moodle
authorPetr Skoda <commits@skodak.org>
Mon, 17 Jan 2011 19:25:56 +0000 (20:25 +0100)
committerPetr Skoda <commits@skodak.org>
Mon, 17 Jan 2011 19:25:56 +0000 (20:25 +0100)

Trivial merge