Merge branch 'MDL-25596' of git://github.com/samhemelryk/moodle
authorPetr Skoda <commits@skodak.org>
Mon, 27 Dec 2010 12:51:25 +0000 (13:51 +0100)
committerPetr Skoda <commits@skodak.org>
Mon, 27 Dec 2010 12:51:25 +0000 (13:51 +0100)

Trivial merge