From 136bf6f61d6045b892fc24f516241ea0d3874e41 Mon Sep 17 00:00:00 2001
From: FFMee <beda@meerane.freifunk.net>
Date: Thu, 2 Jul 2015 23:31:51 +0200
Subject: [PATCH 1/2] fixed typo

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7849425..80c3a70 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ Hint: In version 1.1 this option was moved to the tinc binary and is called <cod
 ### Execute post-merge hook
 This step is necessary to populate your new configuration with infos about the metanodes.
 
-    # ./git/hooks/post-merge
+    # ./.git/hooks/post-merge
 
 ### Set up a cronjob to update the repository in regular intervals.
 

From 35d1c7da5454f78a2ade6fc693e3f01d269b138e Mon Sep 17 00:00:00 2001
From: FFMee <beda@meerane.freifunk.net>
Date: Thu, 2 Jul 2015 23:40:49 +0200
Subject: [PATCH 2/2] a new friend for the cloud

---
 hosts/meerane1 | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 hosts/meerane1

diff --git a/hosts/meerane1 b/hosts/meerane1
new file mode 100644
index 0000000..e1dabdd
--- /dev/null
+++ b/hosts/meerane1
@@ -0,0 +1,9 @@
+Address = ffmeeic10.meerane.freifunk.net
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAym1/4gwwOUaCuUAee+JD0yPVSNbhVwJDkroqpcnSRDh6Zvyl/jTe
+Xc/qB0eIba8EnuskBggF+Zkqfob9C0O+AxwxKMlv5tnR7XKS4/CYRoW5jKRkxDn6
+ObZC/DbizbNE3ZmbAdztdCBp8txhuog889xYx0gK/Xe8g5ICFkr7l5yyn2dxZDvp
+Eqbi+b9fWalWTtyXwGio1WU+8EgnMG6P6re6kKIsCezR0vbHo661iG1MgV3B8liy
+4zclS5bdukRBpuIU4BXW4dSJkXSbBFsOFxkPlgrZCpkxbFDQ0/awwgZ8nFE+Y3IR
+hFQp+qR37FGFAjgo31CYNn2oLhJ3gjL8eQIDAQAB
+-----END RSA PUBLIC KEY-----