Merge commit '803b586cd0a6fe7fcdb2b901e80e1a620201df8f' into stable

To update the git submodules in the stable branch as well.

Conflicts:
	modules
	site.conf

modules

@@ -1,4 +1,4 @@
 GLUON_SITE_FEEDS='ffpb'
 
 PACKAGES_FFPB_REPO=http://git.c3pb.de/freifunk-pb/ffpb-packages.git
-PACKAGES_FFPB_COMMIT=cb21f9c295cf5713c37df4a4cc61fde11fe4f53c
+PACKAGES_FFPB_COMMIT=29e06a3f87272d43dd87a4330d2751187c9f90f7

site.mk

@@ -18,7 +18,8 @@ GLUON_SITE_PACKAGES := \
 	iptables \
 	haveged
 
-DEFAULT_GLUON_RELEASE := 0.5.1+exp$(shell date '+%Y%m%d')
+# 0.2~1 < 0.2 < 0.2+1 < 0.2-1 < 0.2.1 < 0.3
+DEFAULT_GLUON_RELEASE := 0.6~exp$(shell date '+%Y%m%d')
 DEFAULT_GLUON_PRIORITY := 0
 
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)