Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 05beae43cfeb15ea89b984d36105dcdbdffd0975

 interface/web/mail/mail_user_list.php

@@ -44,7 +44,7 @@
}

$list = new list_action;
$list->SQLOrderBy = 'ORDER BY email';
$list->SQLOrderBy = 'ORDER BY mail_user.email';
$list->onLoad();