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)
commitac6668198b4b01565acae197bbccb204714b4349
tree3814afe3929df3866b8bed1b9bce7a8dde654e93
parentf5936345cdcc69e250963b6cafd073c5012e54d8
parent7e1450977ea0feac07806196b00ff9ddd81a8b08
Merge branch 'MDL-27732-glossary-introformat' of git://github.com/mudrd8mz/moodle