Eloy Lafuente (stronk7) 605324fb10 Merge branch 'MDL-49330-master' of git://github.com/jleyva/moodle
Conflicts:
	lib/db/services.php
	version.php
2015-04-02 11:06:20 +02:00
..