modified:   cache/cache.interface.php
	modified:   core/core.class.php
Merge branch 'master' of github.com:xiuno/xiunophp
Merge branch 'master' of github.com:xiuno/xiunophp
	modified:   lib/xn_mail.class.php
Merge branch 'master' of github.com:xiuno/xiunophp

Conflicts:
	core/core.class.php