Merge branch 'MDL-37801_glossary_links' of git://github.com/davosmith/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Feb 2013 00:01:14 +0000 (01:01 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Feb 2013 00:01:14 +0000 (01:01 +0100)

Trivial merge