Merge branch 'MDL-28725_wiki_section2' of git://github.com/andyjdavis/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 4 Oct 2011 03:21:16 +0000 (16:21 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 4 Oct 2011 03:21:16 +0000 (16:21 +1300)

Trivial merge