Merge branch 'wip-MDL-23532-master' of git://github.com/samhemelryk/moodle
authorPetr Skoda <commits@skodak.org>
Mon, 25 Apr 2011 15:50:01 +0000 (17:50 +0200)
committerPetr Skoda <commits@skodak.org>
Mon, 25 Apr 2011 15:50:01 +0000 (17:50 +0200)

Trivial merge