From 29303752782a094c7a523c6338d43504a1d87587 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 7 Jun 2015 02:52:49 +0200
Subject: [PATCH] Release v2015.4

---
 CHANGELOG.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5c28e73..b86fccd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Freifunk München Firmware Changelog
 
+## v2015.4
+ - Updated to Gluon 2015.1
+   - More supported architectures and router models are available, including x86
+ - Setup Mode
+   - A new wifi configuration page is available to disable client and mesh
+     networks on 2.4 & 5GHz indiviually
+   - Mesh on WAN can now be configured and is enabled by default
+   - Internationalization for German and English is available and will
+     be autodetected depending on the browser setting
+
 ## v2015.3
  - Add 4 new gateways as placeholders (not all are and will be active immediately)
  - Integrated no_rebroadcast fix on mesh-vpn from Gluon Upstream