Merge branch 'wip-MDL-26013-master' of git://github.com/samhemelryk/moodle
authorPetr Skoda <commits@skodak.org>
Sun, 17 Apr 2011 14:21:51 +0000 (16:21 +0200)
committerPetr Skoda <commits@skodak.org>
Sun, 17 Apr 2011 14:21:51 +0000 (16:21 +0200)

Trivial merge