Merge branch 'wip-MDL-26423' of git://github.com/sammarshallou/moodle
authorPetr Skoda <commits@skodak.org>
Mon, 7 Mar 2011 11:28:27 +0000 (12:28 +0100)
committerPetr Skoda <commits@skodak.org>
Mon, 7 Mar 2011 11:28:27 +0000 (12:28 +0100)

Trivial merge