Marina Glancy 1637827d75 Merge branch 'wip-mdl-42584' of https://github.com/rajeshtaneja/moodle
Conflicts:
	lib/classes/event/user_deleted.php
2013-11-01 13:04:29 +11:00
..