Merge branch 'MDL-27732-glossary-introformat' of git://github.com/mudrd8mz/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 7 Jun 2011 08:13:52 +0000 (16:13 +0800)
committerSam Hemelryk <sam@moodle.com>
Tue, 7 Jun 2011 08:13:52 +0000 (16:13 +0800)

Trivial merge