Merge remote branch 'upstream/master'

Conflicts:
	etc/inc/interfaces.inc
	etc/inc/system.inc

1 files changed, 8 insertions, 2 deletions

diff --git a/usr/local/www/status_services.php b/usr/local/www/status_services.php
index 779e396..d463f3a 100755
--- a/usr/local/www/status_services.php
+++ b/usr/local/www/status_services.php
@@ -334,9 +334,15 @@ foreach (array('server', 'client') as $mode) {
 		}
 	}
 }
- 
- 
+
+function service_name_compare($a, $b) {
+	if (strtolower($a['name']) == strtolower($b['name']))
+		return 0;
+	return (strtolower($a['name']) < strtolower($b['name'])) ? -1 : 1;
+}
+
 if (count($services) > 0) {
+	uasort($services, "service_name_compare");
 	foreach($services as $service) {
 		if (empty($service['name']))
 			continue;