changeset 939:99b51e3a010c draft

Merge git://1.5.5.20
author Nick <nick@somerandomnick.ano>
date Wed, 14 Mar 2012 01:21:01 +0000
parents 8fa1b48247d7 (diff) 6d48f20556a6 (current diff)
children 3a2b5cd0ad4d
files
diffstat 4 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/juicyfruit/@/.gitignore	Wed Mar 14 01:21:01 2012 +0000
@@ -0,0 +1,1 @@
+temp.keys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/juicyfruit/@/default.key	Wed Mar 14 01:21:01 2012 +0000
@@ -0,0 +1,1 @@
+f0e29dd68e5aaad31652a324764736fce5bb58e721da6a6fb38f04c958a3ba1a
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/juicyfruit/@/owner	Wed Mar 14 01:21:01 2012 +0000
@@ -0,0 +1,1 @@
+juicyfruit
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/juicyfruit/@/path	Wed Mar 14 01:21:01 2012 +0000
@@ -0,0 +1,1 @@
+/juicyfruit