Merge branch 'MDL-29848-master' of https://github.com/mackensen/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 20 Mar 2012 08:06:40 +0000 (16:06 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 20 Mar 2012 08:06:40 +0000 (16:06 +0800)
1  2 
mod/glossary/lib.php

Simple merge