Merge branch 'm20_MDL-25781_TOC_fix' of git://github.com/danmarsden/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 31 Jan 2011 09:06:53 +0000 (17:06 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 31 Jan 2011 09:06:53 +0000 (17:06 +0800)

Trivial merge