From f5420019ab75ecfa65ff2f9d449e774e126710c5 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 19 Jun 2015 00:19:46 +0200
Subject: [PATCH] Update CHANGELOG for v2015.5

---
 CHANGELOG.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b86fccd..35c54e3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
 # Freifunk München Firmware Changelog
 
-## v2015.4
+## v2015.5
+ - Updated to Gluon 2015.1.1
+   - Fixes some problems with mesh ono LAN setups
+ - x86 images now support two network interfaces, eth0 for LAN and eth1 for WAN
+ - Mesh on WAN is disabled by default
+
+## v2015.4 (never released)
  - Updated to Gluon 2015.1
    - More supported architectures and router models are available, including x86
  - Setup Mode