Merge branch 'wip-MDL-30649-master' of git://github.com/phalacee/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 9 May 2012 23:56:58 +0000 (11:56 +1200)
committerSam Hemelryk <sam@moodle.com>
Wed, 9 May 2012 23:56:58 +0000 (11:56 +1200)
commit320b4deb6ab195276e047633ad0f64409aa6b25c
tree8fe296226fe72f811750a8da0a42e5a392e02de5
parent5c7b68f25ad7b66bc7a8db1190d67cb5a017d043
parent486a138bf1d2efb0b6dc8b244c5b13df3e5995ba
Merge branch 'wip-MDL-30649-master' of git://github.com/phalacee/moodle
mod/glossary/lib.php