Merge branch 'MDL-26847_amended' of git://github.com/timhunt/moodle
authorPetr Skoda <commits@skodak.org>
Mon, 21 Mar 2011 17:10:35 +0000 (18:10 +0100)
committerPetr Skoda <commits@skodak.org>
Mon, 21 Mar 2011 17:10:35 +0000 (18:10 +0100)

Trivial merge