From 3fb12769ca65b2c40bdb1c32c69c9d53eeec4574 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 5 Aug 2016 16:43:07 +0200
Subject: [PATCH] Switch to upstream gluon master

---
 CHANGELOG.md | 4 ++++
 Makefile     | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 31a372f..bf0ec35 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Freifunk München Firmware Changelog
 
+## v2016.1
+
+UNRELEASED
+
 ## v2016.0
  - Updated to Gluon v2016.1.5 (ffmuc fork)
    - Changes:
diff --git a/Makefile b/Makefile
index b541646..e4055c6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 GLUON_BUILD_DIR := gluon-build
-GLUON_GIT_URL := https://github.com/freifunkmuc/gluon.git
-GLUON_GIT_REF := dddade25de0c20207385c339d66d3ac7b8092136
+GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git
+GLUON_GIT_REF := d445cb772d2a7f4f0bfb31a6aa1751a285ea2493
 
 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key