Merged revisions 3960-4065 from stable branch.

tbrehm

2013-07-31 615a0a96618fa99e7e452523145d6c0f238d4473

 interface/web/sites/ftp_user_list.php

@@ -68,7 +68,7 @@
}

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