Merge branch 'wip-MDL-30649-master' of git://github.com/phalacee/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 9 May 2012 23:56:58 +0000 (11:56 +1200)
committerSam Hemelryk <sam@moodle.com>
Wed, 9 May 2012 23:56:58 +0000 (11:56 +1200)
1  2 
mod/glossary/lib.php

Simple merge