Merged language files.

tbrehm

2013-08-07 8be86f057cf8fb2291ee0f9d9a5e135cd2f9fa20

 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();