Eloy Lafuente (stronk7) 18ccaca2e2 Merge branch 'MDL-41726-master-2nd' of git://github.com/FMCorz/moodle
Conflicts:
	lang/en/moodle.php
2013-09-24 23:13:50 +02:00
..