Merge branch 'MDL-32325-master' of git://github.com/FMCorz/moodle
authorSam Hemelryk <sam@moodle.com>
Thu, 7 Jun 2012 22:20:43 +0000 (10:20 +1200)
committerSam Hemelryk <sam@moodle.com>
Thu, 7 Jun 2012 22:20:43 +0000 (10:20 +1200)
commit5874cc6aabcc2a15a9c4e6db0c4c3b8d82f39c9c
treed27b1ae21a47dffa311a75aa895b953be43a63e8
parent03a94794fc6fcae6ff3c8635b32e0bdd6909054f
parent50d24a3c856c607039840db31e6af07cc79d19a5
Merge branch 'MDL-32325-master' of git://github.com/FMCorz/moodle
mod/glossary/lib.php