Merge branch 'wip-MDL-33857-MOODLE_23_STABLE' of git://github.com/marinaglancy/moodle...
authorSam Hemelryk <sam@moodle.com>
Tue, 16 Oct 2012 05:31:31 +0000 (13:31 +0800)
committerSam Hemelryk <sam@moodle.com>
Tue, 16 Oct 2012 05:31:31 +0000 (13:31 +0800)
1  2 
mod/glossary/locallib.php

Simple merge