From 73fa45d03fb479bacea7373a46ca7de8ee4b3c6a Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 19 Aug 2015 18:09:35 +0200
Subject: [PATCH] Update changelog for v2015.6

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0e1d9aa..35183d5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Freifunk München Firmware Changelog
 
+## v2015.6
+ - Updated to Gluon 2015.1.2
+   - Changes: https://gluon.readthedocs.org/en/v2015.1.2/releases/v2015.1.2.html
+
 ## v2015.5
  - Updated to Gluon 2015.1.1
    - Fixes some problems with mesh on LAN setups