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

Trivial merge