Merge branch 'wip-MDL-33297-master' of git://github.com/abgreeve/moodle
authorAparup Banerjee <aparup@moodle.com>
Thu, 21 Jun 2012 09:34:57 +0000 (17:34 +0800)
committerAparup Banerjee <aparup@moodle.com>
Thu, 21 Jun 2012 09:34:57 +0000 (17:34 +0800)
commit7cacb2ef085d6fd74ddd6106b6e74a799631d6b4
tree81d1330254ae6a8842346fa0fef889553e280d61
parent2a67e6f28bb9d20794a11e858a37032eacbcf00b
parent35ca63c166c2ef21a77cb0db92f6391fe877c946
Merge branch 'wip-MDL-33297-master' of git://github.com/abgreeve/moodle
mod/glossary/lib.php