# HG changeset patch
# User lex <lex@lynx.ano>
# Date 1294834431 21600
# Node ID 4fbc2e8407b04c5df7bbdd6907e1d990ce62799c
# Parent  59102e1e06f9db31b7e1565d813e55cd3ee96c94# Parent  30b747e3c5d6b9ddb8194324d1cc8dc7d6db62b4
Merge branch 'master' of git://1.0.27.102

diff -r 59102e1e06f9 -r 4fbc2e8407b0 .gitignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.gitignore	Wed Jan 12 06:13:51 2011 -0600
@@ -0,0 +1,2 @@
+conf
+export
diff -r 59102e1e06f9 -r 4fbc2e8407b0 configure
diff -r 59102e1e06f9 -r 4fbc2e8407b0 db/as/62487/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/as/62487/owner	Wed Jan 12 06:13:51 2011 -0600
@@ -0,0 +1,1 @@
+Atiti
diff -r 59102e1e06f9 -r 4fbc2e8407b0 db/dom/ano/search/ns/ns1.search.ano
--- a/db/dom/ano/search/ns/ns1.search.ano	Tue Jan 11 14:08:40 2011 -0600
+++ b/db/dom/ano/search/ns/ns1.search.ano	Wed Jan 12 06:13:51 2011 -0600
@@ -1,1 +1,1 @@
-1.0.9.50
+1.1.123.1
diff -r 59102e1e06f9 -r 4fbc2e8407b0 db/dom/ano/search/owner
--- a/db/dom/ano/search/owner	Tue Jan 11 14:08:40 2011 -0600
+++ b/db/dom/ano/search/owner	Wed Jan 12 06:13:51 2011 -0600
@@ -1,1 +1,1 @@
-rn_zippy
+atiti
diff -r 59102e1e06f9 -r 4fbc2e8407b0 db/usr/atiti/git
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/usr/atiti/git	Wed Jan 12 06:13:51 2011 -0600
@@ -0,0 +1,1 @@
+git://1.1.123.1/
diff -r 59102e1e06f9 -r 4fbc2e8407b0 git-commit
--- a/git-commit	Tue Jan 11 14:08:40 2011 -0600
+++ b/git-commit	Wed Jan 12 06:13:51 2011 -0600
@@ -1,4 +1,4 @@
 #!/bin/sh
-git add configure db doc git-commit gitd scripts contrib
+git add configure db doc git-commit gitd scripts contrib .gitignore
 git commit
 test -x /usr/lib/git-core/git-update-server-info && /usr/lib/git-core/git-update-server-info