Merged revisions 3960-4065 from stable branch.

tbrehm

2013-07-31 615a0a96618fa99e7e452523145d6c0f238d4473

 interface/web/admin/server_ip_list.php

@@ -46,7 +46,7 @@

$app->uses('listform_actions');

$app->listform_actions->SQLOrderBy = "ORDER BY server_id, ip_address";
$app->listform_actions->SQLOrderBy = "ORDER BY server_ip.server_id, server_ip.ip_address";

$app->listform_actions->onLoad();