From 1be0e3bc734d490e1df36ce9b22630c3295d5b16 Mon Sep 17 00:00:00 2001
From: amperpirat <amperpirat@gmx.de>
Date: Sat, 29 Nov 2014 17:55:10 +0100
Subject: [PATCH] changed to version snapshot~20141119

---
 site.conf | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/site.conf b/site.conf
index 5db8476..9f0ff70 100644
--- a/site.conf
+++ b/site.conf
@@ -1,23 +1,28 @@
 --[[	
 
 	******  Gluon site.conf ******
-	Current version: 0.6~stable20141018 
+	Current version: snapshot~20141119
 	Branch: stable
 	Author: Ole
-	Datum: 18.10.2014
+	Datum: 19.11.2014
 
 	recent bugfixes/changes for next generation firmware (to-be-enrolled shortly)
-	- fixed ipv4-prefix to /16 netmask (04.11.2014)
-	- changed gateways ips to domain-names 
-	- changed msg_pub_key to automate entering the node-data to our key-form (01.11.2014)
-	- changed mesh-SSID from 02:0E:8E:1E:61:17 to mesh.ffm 
-	- added ntp_servers '2.ntp.services.ffm','3.ntp.services.ffm','4.ntp.services.ffm' (18.11.2014)
-	- changed site_code back to ffmuc (instead of ffm) (18.11.2014)
-	- changed hostname_prefix to NULL (18.11.2014) 
-	- changed mesh_ssid to mesh.ffmuc
-	- added public key from fpletz
+
+
 
 	Changelog:
+
+	snapshot~20141119	19.11.2014	Ole
+        - fixed ipv4-prefix to /16 netmask (04.11.2014)
+        - changed gateways ips to domain-names
+        - changed msg_pub_key to automate entering the node-data to our key-form (01.11.2014)
+        - changed mesh-SSID from 02:0E:8E:1E:61:17 to mesh.ffm
+        - added ntp_servers '2.ntp.services.ffm','3.ntp.services.ffm','4.ntp.services.ffm' (18.11.2014)
+        - changed site_code back to ffmuc (instead of ffm) (18.11.2014)
+        - changed hostname_prefix to NULL (18.11.2014)
+        - changed mesh_ssid to mesh.ffmuc
+        - added public key from fpletz
+
 	0.6~stable20141018	18.10.2014	Ole
 	- changed ip address for gw02