Merge branch 'wip-MDL-25651' of git://github.com/jennymgray/moodle
authorPetr Skoda <commits@skodak.org>
Mon, 4 Apr 2011 07:55:41 +0000 (09:55 +0200)
committerPetr Skoda <commits@skodak.org>
Mon, 4 Apr 2011 07:55:41 +0000 (09:55 +0200)

Trivial merge