Merge branch 'MDL-58642-master' of git://github.com/lameze/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 19 Apr 2017 08:20:21 +0000 (16:20 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 19 Apr 2017 08:20:21 +0000 (16:20 +0800)
1  2 
mod/glossary/lib.php

Simple merge