Merge branch 'wip-MDL-25602-master' of git://github.com/samhemelryk/moodle
authorPetr Skoda <commits@skodak.org>
Mon, 15 Aug 2011 18:45:43 +0000 (20:45 +0200)
committerPetr Skoda <commits@skodak.org>
Mon, 15 Aug 2011 18:45:43 +0000 (20:45 +0200)

Trivial merge