Merge branch 'master' into stable

site.conf

@@ -4,7 +4,7 @@
   site_code = 'ffmuc',
   opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%S/packages',
 
-  prefix4 = '10.80.0.0/16',
+  prefix4 = '10.80.32.0/19',
   prefix6 = 'fdef:ffc0:4fff::/64',
 
   timezone = 'CET-1CEST,M3.5.0,M10.5.0/3',
@@ -33,7 +33,7 @@
   },
 
   next_node = {
-    ip4 = '10.80.0.1',
+    ip4 = '10.80.32.1',
     ip6 = 'fdef:ffc0:4fff::1',
     mac = '16:41:95:40:f7:dc',
   },
@@ -45,7 +45,7 @@
       backbone = {
       limit = 1,
         peers = {
-          gw03 = {   --[[ fpletz ]]
+          gw03 = {
             key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41',
             remotes = {
               'ipv4 "gw03.ffmuc.net" port 10000',