Merge branch 'testing' into stable

extra/sites.conf

@@ -164,7 +164,7 @@
 			['%%SS'] = 'hochstift.freifunk.net/lichtenau',
 		},
 		site_select = {
-			group = 'pb_sued',
+			group = 'pb_ost',
 		},
 	},
 	{
@@ -309,4 +309,4 @@
 			group = 'uml',
 		},
 	},
-}
+}

site.mk

@@ -61,11 +61,11 @@ ifeq ($(GLUON_TARGET),x86-64)
 endif
 
 # 0.2~1 < 0.2 < 0.2+1 < 0.2-1 < 0.2.1 < 0.3
-DEFAULT_GLUON_RELEASE := 1.0.1~exp$(shell date '+%Y%m%d')
+DEFAULT_GLUON_RELEASE := 1.0.2~exp$(shell date '+%Y%m%d')
 DEFAULT_GLUON_PRIORITY := 0
 
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
 GLUON_PRIORITY ?= $(DEFAULT_GLUON_PRIORITY)
 GLUON_REGION ?= eu
 GLUON_LANGS ?= en de
-GLUON_ATH10K_MESH ?= 11s
+GLUON_ATH10K_MESH ?= 11s