Merge branch 'PULL-314' of git://github.com/mudrd8mz/moodle
authorPetr Skoda <commits@skodak.org>
Fri, 18 Feb 2011 17:20:44 +0000 (18:20 +0100)
committerPetr Skoda <commits@skodak.org>
Fri, 18 Feb 2011 17:20:44 +0000 (18:20 +0100)

Trivial merge