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

Trivial merge