# HG changeset patch
# User Nick <nick@somerandomnick.ano>
# Date 1331688061 0
# Node ID 99b51e3a010c47c099b0212af2b964fc3bb4ddb6
# Parent  8fa1b48247d7bdbbcf6256c41853766c3a69d374# Parent  6d48f20556a63ef9885f368fe205321698f0a25c
Merge git://1.5.5.20

diff -r 8fa1b48247d7 -r 99b51e3a010c db/dom/ano/wakawaka/ns/ns1.wakawaka.ano
--- a/db/dom/ano/wakawaka/ns/ns1.wakawaka.ano	Wed Mar 14 00:41:48 2012 +0000
+++ b/db/dom/ano/wakawaka/ns/ns1.wakawaka.ano	Wed Mar 14 01:21:01 2012 +0000
@@ -1,1 +1,1 @@
-1.0.111.1
+1.5.5.1
diff -r 8fa1b48247d7 -r 99b51e3a010c db/udpmsg4/WWW/@/.gitignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/WWW/@/.gitignore	Wed Mar 14 01:21:01 2012 +0000
@@ -0,0 +1,1 @@
+temp.keys
diff -r 8fa1b48247d7 -r 99b51e3a010c db/udpmsg4/WWW/@/default.key
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/WWW/@/default.key	Wed Mar 14 01:21:01 2012 +0000
@@ -0,0 +1,1 @@
+afd015793b655c87b0a71f596593c1b6214c7d2835766b8502abdba4b437d014
diff -r 8fa1b48247d7 -r 99b51e3a010c db/udpmsg4/WWW/@/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/WWW/@/owner	Wed Mar 14 01:21:01 2012 +0000
@@ -0,0 +1,1 @@
+wakawaka
diff -r 8fa1b48247d7 -r 99b51e3a010c db/udpmsg4/WWW/@/path
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/WWW/@/path	Wed Mar 14 01:21:01 2012 +0000
@@ -0,0 +1,1 @@
+/WWW
diff -r 8fa1b48247d7 -r 99b51e3a010c db/usr/wakawaka/git
--- a/db/usr/wakawaka/git	Wed Mar 14 00:41:48 2012 +0000
+++ b/db/usr/wakawaka/git	Wed Mar 14 01:21:01 2012 +0000
@@ -1,1 +1,1 @@
-git://1.9.9.1/.git/
+git://1.5.5.1/.git/