From 6e6dd65cef43d34bde2cc61eba3ee12cffbbb8e8 Mon Sep 17 00:00:00 2001
From: root <Roberto De Ioris>
Date: Fri, 7 Dec 2012 11:30:17 +0100
Subject: [PATCH] updated Changelog for 1.5

---
 ChangeLog | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 4ff14805..4222d37f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 *** current ***
 
+ * 1.5
+
+- added --not-alarm-log
+- support for TCP_FASTOPEN (Linux-only)
+- improved emperor reloading
+- added --get
+- Legion subsystem
+- emperor_zeromq plugin
+- SNI support
+- distributed SSL session cache
+
+*** november 2012 ***
+
  * 1.4
 
 - gevent improvements