Merge branch 'MDL-38599-master-int' of git://github.com/FMCorz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Apr 2013 22:51:47 +0000 (00:51 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Apr 2013 22:51:47 +0000 (00:51 +0200)
commit75fb3832604a33974afb0c77dab865ff71ede99b
tree8c7ec3a95b95f661486bfc145c97d0fcd588f48e
parent68a6d3cd9ffbf945d2d0fba542ea55c7b8e7109f
parentf3aadb1cd0e397ec8cfbda92c6c54c26713981ad
Merge branch 'MDL-38599-master-int' of git://github.com/FMCorz/moodle

Conflicts:
mod/glossary/mod_form.php
lang/en/moodle.php
mod/glossary/mod_form.php