Eloy Lafuente (stronk7) 1333c05ebe Merge branch 's11_MDL-27936_send_message_master' of github.com:dongsheng/moodle
Conflicts:
	lib/db/services.php
	version.php
2011-06-29 20:00:49 +02:00
..