From 15ff275f7089f25feb2b4b0642e496633cfde1de Mon Sep 17 00:00:00 2001
From: Jan-Philipp Litza <janphilipp@litza.de>
Date: Thu, 22 Sep 2016 20:26:18 +0200
Subject: [PATCH] Update to 2016.2

---
 gluon     | 2 +-
 site.conf | 6 ++++++
 site.mk   | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/gluon b/gluon
index c98cad3..6964d30 160000
--- a/gluon
+++ b/gluon
@@ -1 +1 @@
-Subproject commit c98cad36560171b11802cbd48188c9530e2c4335
+Subproject commit 6964d30ff24eef9fc436e97bc909dc4c5e048ad4
diff --git a/site.conf b/site.conf
index 81ff878..1854367 100644
--- a/site.conf
+++ b/site.conf
@@ -159,4 +159,10 @@
 			limit_ingress = 8000,
 		},
 	},
+
+	config_mode = {
+		geo_location = {
+			show_altitude = false,
+		},
+	},
 }
diff --git a/site.mk b/site.mk
index 0fbd250..acec173 100644
--- a/site.mk
+++ b/site.mk
@@ -35,3 +35,4 @@ DEFAULT_GLUON_PRIORITY := 0
 GLUON_PRIORITY ?= $(DEFAULT_GLUON_PRIORITY)
 GLUON_LANGS ?= en de
 GLUON_REGION ?= eu
+GLUON_ATH10K_MESH ?= ibss