Merge branch 'todo_wiki_upgrade_master' of git://github.com/stronk7/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 7 Jun 2011 08:01:49 +0000 (16:01 +0800)
committerSam Hemelryk <sam@moodle.com>
Tue, 7 Jun 2011 08:01:49 +0000 (16:01 +0800)

Trivial merge