Merge branch 'master' of https://github.com/bitcoin/bitcoin into patched

Unreal89 · Apr 2, 2011 · c902d2a · c902d2a
2 parents 9207c3b + a2b6c19
commit c902d2a
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/net.cpp b/net.cpp
@@ -972,6 +972,7 @@ void MapPort(bool fMapPort)
 
 static const char *strDNSSeed[] = {
     "bitseed.xf2.org",
+    "bitseed.bitcoin.org.uk",
 };
 
 void DNSAddressSeed()