Merge branch '44158-27' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 17 Feb 2014 06:48:01 +0000 (14:48 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 17 Feb 2014 06:48:01 +0000 (14:48 +0800)
commita500fd06ce011833e928effb18172b195a22a31d
tree3320b5b20e4f301bbdc52f62cfb1543af1166bd4
parent89542d28889fc925566901c5defa15c12cae8b70
parentd01fb561db1dd6224460d9dcb97929741bc1e4c5
Merge branch '44158-27' of git://github.com/samhemelryk/moodle
mod/glossary/lib.php