modified:   includes/Users.class.php
	modified:   includes/class.core.php
	modified:   includes/settings.yaml
	modified:   login-actions.php
Merge isengard.dk:root/login-system