From 02470dffa54d176cd2d0a144f2bc46d4790ef274 Mon Sep 17 00:00:00 2001
From: TingPing <tingping@tingping.se>
Date: Mon, 19 Jan 2015 11:31:42 -0500
Subject: [PATCH] servlist: Add AthemeNet and remove its old networks

Closes #1272
---
 src/common/servlist.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/common/servlist.c b/src/common/servlist.c
index 9b509ee3..010ea55d 100644
--- a/src/common/servlist.c
+++ b/src/common/servlist.c
@@ -80,13 +80,6 @@ static const struct defaultserver def[] =
 	{0,			"irc.kis.lt"},
 	{0,			"irc.vub.lt"},
 
-	{"AlphaChat",	0, 0, 0, LOGIN_SASL},
-	{0,			"irc.alphachat.net"},
-	{0,			"na.alphachat.net"},
-	{0,			"eu.alphachat.net"},
-	{0,			"au.alphachat.net"},
-	{0,			"za.alphachat.net"},
-
 	{"Anthrochat", 0},
 #ifdef USE_OPENSSL
 	{0,			"irc.anthrochat.net/+6697"},
@@ -108,6 +101,12 @@ static const struct defaultserver def[] =
 	{0,			"uk2.arcnet.vapor.com"},
 	{0,			"fr1.arcnet.vapor.com"},
 
+	{"AthemeNet", 0, 0, 0, LOGIN_SASL},
+#ifdef USE_OPENSSL
+	{0,			"irc.atheme.org/+6697"},
+#endif
+	{0,			"irc.atheme.org"},
+
 	{"AustNet",	0},
 	{0,			"au.austnet.org"},
 	{0,			"us.austnet.org"},
@@ -438,9 +437,6 @@ static const struct defaultserver def[] =
 	{0,			"tahoma.starchat.net"},
 	{0,			"neo.starchat.net"},
 
-	{"StaticBox", 0, 0, 0, LOGIN_SASL},
-	{0,			"irc.staticbox.net"},
-
 	{"Station51", 0},
 #ifdef USE_OPENSSL
 	{0,			"irc.station51.net/+6697"},