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 | 3f26011eb66a1f2ebaf83baf58575a86166cee0e (patch) | |
| tree | debdc94523c6615c61f6e1591a33f96a8aa0bf3d /ytart | |
| parent | fc4be5d34ac11323577c9f0b3e8eeab705e29e00 (diff) | |
| parent | 47e76beaf3e82a91588ca9c9f75909e3e9b97c60 (diff) | |
Merge remote-tracking branch 'oldrepo/master'
Conflicts:
krebs: newline deleted
miefdahome: local net deleted
supernode: replaced ip with dns entry
Diffstat (limited to 'ytart')
| -rw-r--r-- | ytart | 9 |
1 files changed, 9 insertions, 0 deletions
@@ -0,0 +1,9 @@ +Subnet = 10.7.7.201 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEA2yCCN8nAPmZNL75Jr+FtfP5jmyuqg7IpgfW03L3s8Gg7NB1eTQAg +UFPh13cj4lZleZOl3Yus7yx4HxMO8tYCptqnRPyP+UXrxvL+kECS4J3rLzjH/eOM +0oAxuEe+DOa5R9Vj2bRtTouePlEvXDpgZZcDnedutRUYFGLNvkoWxu0RGqfQaJmd +7KtOk1NJn9efNqwpl6ejPj5A+ivh2T1vAMWherM60JTjjhNGiSP4so0WG8PlBPYc +GKnmMSQl0u5n10uTvLoVvnSfLj/QvL3d8abTrFV2lRqaCTJy+lxgkS1A5AnsTP1G +OBbm/Gk9hRuYy2iP6FQ65q64/JfoeoqpPwIDAQAB +-----END RSA PUBLIC KEY----- |