Merge branch 'wip-MDL-25870-master' of git://github.com/samhemelryk/moodle
authorPetr Skoda <commits@skodak.org>
Mon, 18 Jul 2011 12:57:02 +0000 (14:57 +0200)
committerPetr Skoda <commits@skodak.org>
Mon, 18 Jul 2011 12:57:02 +0000 (14:57 +0200)

Trivial merge