# HG changeset patch
# User Ivo Smits <Ivo@UCIS.nl>
# Date 1294838682 -3600
# Node ID f316fd5e13bf5f5e925be044f9072f9707e605e2
# Parent  bab50350aeeeae0d76fcd66f1cb01c22eb9a7466# Parent  2f379a0b64611ea7c24763747e06f0c95723f1e3
Merge branch 'master' of git://git1.somerandomnick.ano

Conflicts:
	db/as/62487/owner

diff -r bab50350aeee -r f316fd5e13bf configure
diff -r bab50350aeee -r f316fd5e13bf db/as/62487/owner
--- a/db/as/62487/owner	Tue Jan 11 22:15:42 2011 +0100
+++ b/db/as/62487/owner	Wed Jan 12 14:24:42 2011 +0100
@@ -1,1 +1,1 @@
-atiti
+Atiti
diff -r bab50350aeee -r f316fd5e13bf db/dom/ano/search/ns/ns1.search.ano
--- a/db/dom/ano/search/ns/ns1.search.ano	Tue Jan 11 22:15:42 2011 +0100
+++ b/db/dom/ano/search/ns/ns1.search.ano	Wed Jan 12 14:24:42 2011 +0100
@@ -1,1 +1,1 @@
-1.0.9.50
+1.1.123.1
diff -r bab50350aeee -r f316fd5e13bf db/dom/ano/search/owner
--- a/db/dom/ano/search/owner	Tue Jan 11 22:15:42 2011 +0100
+++ b/db/dom/ano/search/owner	Wed Jan 12 14:24:42 2011 +0100
@@ -1,1 +1,1 @@
-rn_zippy
+atiti