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)
commitdfc05681f2bcfb7b9d94ea2ebfc901716236b424
treed28e820fbc6dba265e6b9599f6d15071ff14d183
parentcb3c4b448ece053e1c116a9381ec1e093eef1f3c
parent08868f58e4e44c05b955db909ab9f40e75812c4e
Merge branch 'm20_MDL-25781_TOC_fix' of git://github.com/danmarsden/moodle