Eloy Lafuente (stronk7) bf928b2933 Merge branch 'MDL-42459-master' of git://github.com/damyon/moodle
Conflicts:
	version.php
2013-10-22 12:14:29 +02:00
..