# HG changeset patch
# User Nick <nick@somerandomnick.ano>
# Date 1283237853 0
# Node ID 3226332fffd64e5aa0660160784a9d9992fae54c
# Parent  18ac7e165dde06f512eefb420b68c38327d4d49e# Parent  bc35631172600111bb8bb61e0b8eb4edabf3d483
Merge git://1.5.4.10

diff -r bc3563117260 -r 3226332fffd6 db/usr/pragmo/repos/atomictorrent/description
--- a/db/usr/pragmo/repos/atomictorrent/description	Mon Aug 30 23:59:41 2010 -0700
+++ b/db/usr/pragmo/repos/atomictorrent/description	Tue Aug 31 06:57:33 2010 +0000
@@ -1,1 +1,1 @@
-Collection of .torrent file
+Collection of .torrent files
diff -r bc3563117260 -r 3226332fffd6 scripts/nameserver_autogen/tinydns_tld_datafile
--- a/scripts/nameserver_autogen/tinydns_tld_datafile	Mon Aug 30 23:59:41 2010 -0700
+++ b/scripts/nameserver_autogen/tinydns_tld_datafile	Tue Aug 31 06:57:33 2010 +0000
@@ -2,8 +2,8 @@
 if ! ./scripts/check_db_safety; then
  exit 1
 fi
-tldsrvrname="$(./scripts/conf_var tinydns__tldsrvrname b30a3fc880c970d4b4f945dd82af4de2.ns.pragmo.ano)"
-tldsrvrip="$(./scripts/conf_var tinydns__tldsrvrip 1.0.16.100)"
+tldsrvrname="$(./scripts/conf_var tinydns__tldsrvrname uz5fvb7zdqyuz4q8ysjdfuf04kzd2lrt0l6fp4uyguxdg5tfut06ck.anons.somerandomnick.ano)"
+tldsrvrip="$(./scripts/conf_var tinydns__tldsrvrip 1.0.27.37)"
 for tld in db/ip/?? ; do
  if [ "x$(basename $tld)" != 'x??' ]; then
   first="$(basename $tld | ./scripts/hex2dec)"