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)
1  2 
mod/glossary/lib.php

Simple merge