Merge branch 'MDL-50310-master-random-glossary' of git://github.com/mudrd8mz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Feb 2016 21:34:07 +0000 (22:34 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Feb 2016 21:34:07 +0000 (22:34 +0100)

Trivial merge