Merge branch 'master' into nightly

README.md

@@ -2,3 +2,10 @@ site-ffs
 ========
 
 Freifunk Stuttgart specific Gluon configuration
+
+
+Doku: https://gluon.readthedocs.org/en/latest/user/site.html
+
+Gluon versions used for specific Stuttgart Freifunk Firmware builds:
+* ffs-0.6: v2016.1
+* ffs-0.5: v2015.1.2

site.mk

@@ -27,7 +27,7 @@ GLUON_SITE_PACKAGES := \
 	iwinfo
 
 
-DEFAULT_GLUON_RELEASE := 0.6-$(shell date '+%Y.%m.%d-%H.%M')-g.$(shell git -C $(GLUONDIR) log --pretty=format:'%h' -n 1)-s.$(shell git -C $(GLUONDIR)/site log --pretty=format:'%h' -n 1)
+DEFAULT_GLUON_RELEASE := 0.6+$(shell date '+%Y.%m.%d-%H.%M')-g.$(shell git -C $(GLUONDIR) log --pretty=format:'%h' -n 1)-s.$(shell git -C $(GLUONDIR)/site log --pretty=format:'%h' -n 1)
 
 GLUON_LANGS := de en