Merge branch 'MDL-33400' of git://github.com/nebgor/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 12 Jun 2012 05:03:42 +0000 (13:03 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 12 Jun 2012 05:03:42 +0000 (13:03 +0800)
commit555099c66672816dbd095bbf3a1b0f8048967775
tree7f91bb69b99ae60f75d6245c7e798f9368e12505
parent7d22edb6b127dfa9c882ed1f2928c305fa4ead7c
parent6b8b0b2e683ff6712f376da9c8576121fdc763e4
Merge branch 'MDL-33400' of git://github.com/nebgor/moodle
mod/glossary/lib.php
mod/quiz/lib.php