Merge branch 'wip-MDL-28421-master' of https://github.com/Beedell/moodle
authorPetr Skoda <commits@skodak.org>
Mon, 25 Jul 2011 14:51:04 +0000 (16:51 +0200)
committerPetr Skoda <commits@skodak.org>
Mon, 25 Jul 2011 14:51:04 +0000 (16:51 +0200)

Trivial merge