# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1453468970 0
# Node ID 1c3b38f80571b92fe417f66444a49dc20c4e1fd4
# Parent  890f4b2cc4448ce08b6df300336d254eaa93b6db# Parent  7aa37d70944bbe095f4c05b6de99b379ca9cfbd2
Merge 0.10->trunk

diff -r 890f4b2cc444 -r 1c3b38f80571 plugins/mod_admin_telnet.lua
--- a/plugins/mod_admin_telnet.lua	Wed Jan 20 15:04:42 2016 +0100
+++ b/plugins/mod_admin_telnet.lua	Fri Jan 22 13:22:50 2016 +0000
@@ -594,11 +594,11 @@
 	c2s:sort(function(a, b)
 		if a.host == b.host then
 			if a.username == b.username then
-				return a.resource or "" > b.resource or "";
+				return (a.resource or "") > (b.resource or "");
 			end
-			return a.username or "" > b.username or "";
+			return (a.username or "") > (b.username or "");
 		end
-		return a.host or "" > b.host or "";
+		return (a.host or "") > (b.host or "");
 	end):map(function (session)
 		callback(get_jid(session), session)
 	end);