Merge branch 'wip-MDL-35842-master' of git://github.com/phalacee/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 8 Jan 2013 21:07:16 +0000 (10:07 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 8 Jan 2013 21:07:16 +0000 (10:07 +1300)
commit5ba45e34bbdfe0aa1209109be984870b3e6a354d
tree2c585f22e0d98c944210818c82352e3e94401893
parent21117c9d173e2e54fd513bf0d8b235b01e72e468
parent9e7d097926fdf447aedb982c53f1554b898d9d59
Merge branch 'wip-MDL-35842-master' of git://github.com/phalacee/moodle
blocks/glossary_random/block_glossary_random.php
blocks/glossary_random/lang/en/block_glossary_random.php