Merge branch 'MDL-26425' of git://github.com/timhunt/moodle
authorPetr Skoda <commits@skodak.org>
Mon, 28 Mar 2011 14:49:49 +0000 (16:49 +0200)
committerPetr Skoda <commits@skodak.org>
Mon, 28 Mar 2011 14:49:49 +0000 (16:49 +0200)

Trivial merge