Merge branch 'MDL-25676' of git://github.com/danpoltawski/moodle
authorPetr Skoda <commits@skodak.org>
Mon, 27 Dec 2010 11:31:19 +0000 (12:31 +0100)
committerPetr Skoda <commits@skodak.org>
Mon, 27 Dec 2010 11:31:19 +0000 (12:31 +0100)

Trivial merge