name and slogan should be in one line
Merge branch 'theme_aware_mail_footer' of github.com:owncloud/core into theme_aware_mail_footer

Conflicts:
	core/templates/altmail.php