Eloy Lafuente (stronk7) 16dafa5d9f Merge branch 'MDL-48266-master' of git://github.com/FMCorz/moodle
Conflicts:
	version.php
2015-01-26 19:19:35 +01:00
..