From 85b3795536ce5f0adce0c175d93de89e60490404 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 2 Apr 2017 03:43:16 +0200
Subject: [PATCH] Update to gluon 2016.2.4

---
 CHANGELOG.md | 21 +++++++++++----------
 Makefile     |  2 +-
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fee1e12..1932f17 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,15 +4,16 @@
 
 UNRELEASED
 
-- Updated to Gluon v2016.2.3 (upstream)
-  - Changes:
-    - https://gluon.readthedocs.io/en/v2016.2.3/releases/v2016.1.6.html
-    - https://gluon.readthedocs.io/en/v2016.2.3/releases/v2016.2.html
-    - https://gluon.readthedocs.io/en/v2016.2.3/releases/v2016.2.1.html
-    - https://gluon.readthedocs.io/en/v2016.2.3/releases/v2016.2.2.html
-    - https://gluon.readthedocs.io/en/v2016.2.3/releases/v2016.2.3.html
-- site.mk
-  - added GLUON_REGION = eu setting
+ - Updated to Gluon v2016.2.4 (upstream)
+   - Changes:
+     - https://gluon.readthedocs.io/en/v2016.2.3/releases/v2016.1.6.html
+     - https://gluon.readthedocs.io/en/v2016.2.3/releases/v2016.2.html
+     - https://gluon.readthedocs.io/en/v2016.2.3/releases/v2016.2.1.html
+     - https://gluon.readthedocs.io/en/v2016.2.3/releases/v2016.2.2.html
+     - https://gluon.readthedocs.io/en/v2016.2.3/releases/v2016.2.3.html
+     - https://gluon.readthedocs.io/en/v2016.2.3/releases/v2016.2.4.html
+ - site.mk
+   - added GLUON_REGION = eu setting
 
 ## v2016.0
  - Updated to Gluon v2016.1.5 (ffmuc fork)
@@ -27,7 +28,7 @@ UNRELEASED
      - preserve wifi channels feature (76a77902e3624167e81ca6e200519468bb66d5f7)
      - new package tecff-ath9k-broken-wifi-workaround (freifunkmuc/gluon-packages)
      - added fix for autoupdater (8f5a7c90019085dd8f02f96ab0e7a905f82e1be0)
-- site.conf
+ - site.conf
    - changed MTU size to 1280
    - due to the decreased MTU fastd can now support IPv6
  - site.mk
diff --git a/Makefile b/Makefile
index 01dfe21..5dd8ec7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 GLUON_BUILD_DIR := gluon-build
 GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git
-GLUON_GIT_REF := b0c647151c6b4889bca8f9226c1456179e86b25b
+GLUON_GIT_REF := 6cbd6585865b9c25002220ed33e3352f716e92d9
 
 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key