Merge branch git://github.com/phalacee/moodle.git wip-MDL-30482-master
authorAparup Banerjee <aparup@moodle.com>
Wed, 21 Mar 2012 02:50:51 +0000 (10:50 +0800)
committerAparup Banerjee <aparup@moodle.com>
Wed, 21 Mar 2012 02:50:51 +0000 (10:50 +0800)
commit5599f2062c7544ffe744d21523242ec3afdbdd54
tree26db8fce42d7fa81bfc191bce50a71035e588ddd
parentd7de3f26828f8aa36bb331f43e44ed92149f9b65
parentc3963fbd9b51b3eb439d4b630c65d445eeb7a86a
Merge branch git://github.com/phalacee/moodle.git wip-MDL-30482-master
 - resolved conflicts
 - fixed up tab --> spaces
mod/glossary/db/access.php
mod/glossary/lang/en/glossary.php
mod/glossary/lib.php
mod/glossary/version.php