diff options
author | Felix Richter <Felix.Richter@syntax-fehler.de> | 2011-05-10 21:08:59 +0200 |
---|---|---|
committer | Felix Richter <Felix.Richter@syntax-fehler.de> | 2011-05-10 21:08:59 +0200 |
commit | 135fcee283288985e825181ebcfcae359e4975c8 (patch) | |
tree | 88dd18bec97727687d970a82c97a0eff4780512b /hosts/foobaz | |
parent | d14a56d2ac17233dcadac87ecab090b26f8d7150 (diff) | |
parent | b54e30f1d4b37f9b01be4434d6b03e6301c46e14 (diff) |
Merge remote-tracking branch 'oldrepo/master'
Conflicts:
krebs: newline deleted
miefdahome: local net deleted
supernode: replaced ip with dns entry
Diffstat (limited to 'hosts/foobaz')
-rw-r--r-- | hosts/foobaz | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/hosts/foobaz b/hosts/foobaz new file mode 100644 index 00000000..47ac4d6e --- /dev/null +++ b/hosts/foobaz @@ -0,0 +1,8 @@ +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEA4wJHcyS3PI2rugPbhQy5qLKQwtaOIsLV367b9Pq6VLKEly2dWAZx +xvFmdKRbm/n/HaRzX+vyDuhWOxkzrF0NLNrrU58Rw5suHfNU2ryuO1QB2sIGMj1R +QXwB+W6MNM5OamBkLLo740aPvVjfud9tc3yrUg6mTCJP1tbRLgHyDy6DT3s5WGvO +R6bfYRjdzVLjwqqn5P/ED51gBgDmJEhoWzQ4IzBSO+mxRrkvwfPQNiTSrrQBAiU7 +r5lstDzEY8qDdwY6t1w91hxm34LLJ/gQr9uvXGF/GThm4J8Ndlj4tOl8UmFbo3Nz +6Zm0b2JZ4dWbA/NXp7Sf9qKC5duQkAPb1QIDAQAB +-----END RSA PUBLIC KEY----- |