Merge branch 'MDL-26576' of git://github.com/timhunt/moodle
authorPetr Skoda <commits@skodak.org>
Mon, 28 Feb 2011 09:06:03 +0000 (10:06 +0100)
committerPetr Skoda <commits@skodak.org>
Mon, 28 Feb 2011 09:06:03 +0000 (10:06 +0100)

Trivial merge