[pkg] fold in changes

diff --git a/CHANGELOG b/CHANGELOG
index 02e4297..1c6a871 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+0.4.1 Jul 10, 2015:
+  o Fix regexp to allow ipc protocol in zmq sockets. Closes: #7089.
+  o Remove extraneous data from events logs. Closes #7130.
+  o Make https client use Twisted SSL validation and adds a reuse by default
+    behavior on connection pool
+
 0.4.0 Jun 1, 2015:
   o Modify leap.common.events to use ZMQ. Closes #6359.
   o Fix time comparison between local and UTC times that caused the VPN

diff --git a/changes/bug-7089-allow_ipc_proto b/changes/bug-7089-allow_ipc_proto
deleted file mode 100644 (file)
index 7dce314..0000000
--- a/changes/bug-7089-allow_ipc_proto
+++ /dev/null
@@ -1 +0,0 @@
-o [bug] fix regexp to allow ipc protocol in zmq sockets. Closes: #7089

diff --git a/changes/bug-browserlikepolicy-https b/changes/bug-browserlikepolicy-https
deleted file mode 100644 (file)
index bceb129..0000000
--- a/changes/bug-browserlikepolicy-https
+++ /dev/null
@@ -1 +0,0 @@
-- Makes https client use Twisted SSL validation and adds a reuse by default behavior on connection pool

diff --git a/changes/bug_7130_remove-extraneous-data-from-events-logs b/changes/bug_7130_remove-extraneous-data-from-events-logs
deleted file mode 100644 (file)
index 6a12ee5..0000000
--- a/changes/bug_7130_remove-extraneous-data-from-events-logs
+++ /dev/null
@@ -1 +0,0 @@
-  o Remove extraneous data from events logs. Closes #7130.