From: Jameson Graef Rollins <jrollins@phys.columbia.edu>
Date: Sat, 11 Oct 2008 21:19:50 +0000 (-0400)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.16-1~32
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=91d16f389d27fa8e9e7ed721029334e187506da1;hp=1d030ea7bd00458d7e6643a0f0d705356357872e;p=monkeysphere.git

Merge commit 'dkg/master'
---

diff --git a/tests/admin/pubring.gpg b/tests/admin/pubring.gpg
new file mode 100644
index 0000000..ce19633
Binary files /dev/null and b/tests/admin/pubring.gpg differ
diff --git a/tests/admin/random_seed b/tests/admin/random_seed
new file mode 100644
index 0000000..753251b
Binary files /dev/null and b/tests/admin/random_seed differ
diff --git a/tests/admin/secring.gpg b/tests/admin/secring.gpg
new file mode 100644
index 0000000..a46dd5e
Binary files /dev/null and b/tests/admin/secring.gpg differ
diff --git a/tests/admin/trustdb.gpg b/tests/admin/trustdb.gpg
new file mode 100644
index 0000000..77ef133
Binary files /dev/null and b/tests/admin/trustdb.gpg differ