Eloy Lafuente (stronk7) 522b5faf60 Merge branch 'MDL-39642-en_fix' of git://github.com/mudrd8mz/moodle
Conflicts:
	lang/en/badges.php
2013-05-13 12:07:55 +02:00
..
2013-03-22 13:09:50 +01:00