Merge branch 'MDL-26237' of git://github.com/stronk7/moodle
authorPetr Skoda <commits@skodak.org>
Wed, 2 Feb 2011 12:49:16 +0000 (13:49 +0100)
committerPetr Skoda <commits@skodak.org>
Wed, 2 Feb 2011 12:49:16 +0000 (13:49 +0100)

Trivial merge