Merge branch 'w04_MDL-31183_m23_gloscounts' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Jan 2012 11:24:46 +0000 (12:24 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Jan 2012 11:24:46 +0000 (12:24 +0100)
1  2 
mod/glossary/lib.php

Simple merge