Merge branch 'MDL-25321-R1' of git://github.com/samhemelryk/moodle
authorPetr Skoda <commits@skodak.org>
Mon, 27 Dec 2010 11:46:01 +0000 (12:46 +0100)
committerPetr Skoda <commits@skodak.org>
Mon, 27 Dec 2010 11:46:01 +0000 (12:46 +0100)

Trivial merge