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

Simple merge