Eloy Lafuente (stronk7) 75fb383260 Merge branch 'MDL-38599-master-int' of git://github.com/FMCorz/moodle
Conflicts:
	mod/glossary/mod_form.php
2013-04-04 00:51:47 +02:00
..