Merge branch 'glossary_multilang_master' of git://github.com/stronk7/moodle
commitf7776c0fc865683da4cf76a22aedc47691f55118
authorSam Hemelryk <sam@moodle.com>
Mon, 11 Jul 2011 03:14:44 +0000 (11 11:14 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 11 Jul 2011 03:14:44 +0000 (11 11:14 +0800)
tree817b86744221090d18e06e4134c1e8796b99c201
parentc75d584dccd4cfd6c4e40b1a5a8e32c2e08b1d52
parentb86f9306476da96c0fbabe4761329c98c1740ff9
Merge branch 'glossary_multilang_master' of git://github.com/stronk7/moodle