chg: doc: update changelog @minor

skylime · Oct 2, 2014 · 7728ab9 · 7728ab9
1 parent 750a07b
commit 7728ab9
Showing 1 changed file with 20 additions and 1 deletion.
diff --git a/Changelog.md b/Changelog.md
@@ -1,10 +1,29 @@
 # Changelog
 
-## 14.2.5
+## 14.2.6
+
+### New
+
+* update to new core-base image 5f32cd38-4a1f-11e4-82e4-632b59542bc6. [Thomas Merkel]
+
+### Changes
+
+* increase memory limit. [Thomas Merkel]
+
+### Fix
+
+* proftpd ssl certificate chain and ssl problems on different clients. [Thomas Merkel]
+
+## 14.2.5 (2014-09-29)
 
 ### New
 
 * new kumquat version. [Thomas Merkel]
+* Allow global FTP users without any vhost configured. [Thomas Merkel]
+
+### Other
+
+* Merge branch 'master' of github.com:skylime/mi-core-kumquat. [Thomas Merkel]
 
 ## 14.2.4 (2014-09-27)