Merge branch 'master_MDL-31908_glossary_entrylist_print_version_not_showing_content...
authorSam Hemelryk <sam@moodle.com>
Sun, 1 Apr 2012 23:19:58 +0000 (11:19 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 1 Apr 2012 23:19:58 +0000 (11:19 +1200)

Trivial merge