Merge remote-tracking branch 'origin/stable' into altdorf

Merging Ffmuc v2015.5 stable to altdorf branch

Conflicts:
	CHANGELOG.md

CHANGELOG.md

@@ -1,11 +1,19 @@
 # Freifunk München Firmware Changelog
 
-## v2015.4-altdorf
- - Added additional Autoupdate Server
- - Added additional Autoupdate Signatures
+## v2015.5-altdorf
+ - Added additional Autoupdate Server for altdorf
+ - Added additional Autoupdate Signatures for altdorf
  - Made changes necessary for Altdorf in i18n folder
 
-## v2015.4
+## v2015.5
+ - Updated to Gluon 2015.1.1
+   - Fixes some problems with mesh on LAN setups
+ - x86 images now support two network interfaces, eth0 for LAN and eth1 for WAN
+ - Mesh on WAN is disabled by default
+ - VPN connection limit was decreased from 2 to 1 to divide the broadcast traffic
+   into half and take unnecessary load from overloaded gateways
+
+## v2015.4 [never released]
  - Updated to Gluon 2015.1
    - More supported architectures and router models are available, including x86
  - Setup Mode