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)
commit4740c0a64f76d448f40f7c4dda98df8d9f357612
tree1ef25351db7a460fd976175f5da3268ecf5ffe73
parentc35fa27c89170314a336198a80251b819174659e
parented7e6a735663de70df69d4d759550cbf11383a3d
Merge branch 'wip-MDL-33857-MOODLE_23_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_23_STABLE
mod/glossary/locallib.php