[pkg] fold in changes

12 files changed, 18 insertions, 12 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 4c3da7b..885871f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,21 @@
+0.4.0rc1 Jul 10, 2015:
+  o Parse OpenPGP header and import keys from it. Closes: #3879.
+  o Don't add any footer to the emails. Closes: #4692.
+  o Adapt to new events api on leap.common. Related to #5359.
+  o Discover public keys via attachment. Closes: #5937.
+  o Creates a OutgoingMail class that has the logic for encrypting, signing and
+    sending messages. Factors that logic out of EncryptedMessage so it can be
+    used by other clients. Closes: #6357.
+  o Refactor email fetching outside IMAP to it's own independient IncomingMail
+    class. Closes: #6361.
+  o Port `enum` to `enum34`. Closes #6601.
+  o Add public key as attachment. Closes: #6617.
+  o Add listener for each email added to inbox in IncomingMail. Closes: #6742.
+  o Ability to reindex local UIDs after a soledad sync. Closes: #6996.
+  o Update SMTP gateway docs. Closes #7169.
+  o Send a BYE command to all open connections, so that the MUA is notified
+    when the server is shutted down.
+
 0.3.10 Sept 26, 2014:
   o MessageCollection iterator now creates the LeapMessage with the
     collection reference, so setFlags will work properly.
diff --git a/changes/bug-6601_port_enum34 b/changes/bug-6601_port_enum34
deleted file mode 100644
index 2ca551d..0000000
--- a/changes/bug-6601_port_enum34
+++ /dev/null
@@ -1 +0,0 @@
-- Port `enum` to `enum34` (Closes #6601)
diff --git a/changes/bug_7169_update-smtp-gateway-doc b/changes/bug_7169_update-smtp-gateway-doc
deleted file mode 100644
index 5b86140..0000000
--- a/changes/bug_7169_update-smtp-gateway-doc
+++ /dev/null
@@ -1 +0,0 @@
-  o Update SMTP gateway docs. Closes #7169.
diff --git a/changes/feature-3879_openpgp_header b/changes/feature-3879_openpgp_header
deleted file mode 100644
index e04c925..0000000
--- a/changes/feature-3879_openpgp_header
+++ /dev/null
@@ -1 +0,0 @@
-- Parse OpenPGP header and import keys from it (Closes: #3879)
diff --git a/changes/feature-4692_remove_footer b/changes/feature-4692_remove_footer
deleted file mode 100644
index 8eca883..0000000
--- a/changes/feature-4692_remove_footer
+++ /dev/null
@@ -1 +0,0 @@
-- Don't add any footer to the emails (Closes: #4692)
diff --git a/changes/feature-5937_key_attachment b/changes/feature-5937_key_attachment
deleted file mode 100644
index 08c37e0..0000000
--- a/changes/feature-5937_key_attachment
+++ /dev/null
@@ -1 +0,0 @@
-- Discover public keys via attachment (Closes: #5937)
diff --git a/changes/feature-6357_factor_encryptio_and_sending_out_of_encrypted_message b/changes/feature-6357_factor_encryptio_and_sending_out_of_encrypted_message
deleted file mode 100644
index 6b95c6a..0000000
--- a/changes/feature-6357_factor_encryptio_and_sending_out_of_encrypted_message
+++ /dev/null
@@ -1 +0,0 @@
-- Creates a OutgoingMail class that has the logic for encrypting, signing and sending messages. Factors that logic out of EncryptedMessage so it can be used by other clients (Closes: #6357)
diff --git a/changes/feature-6598_refactor_incoming_mail b/changes/feature-6598_refactor_incoming_mail
deleted file mode 100644
index 1db8c28..0000000
--- a/changes/feature-6598_refactor_incoming_mail
+++ /dev/null
@@ -1,2 +0,0 @@
-- Refactor email fetching outside IMAP to it's own independient IncomingMail class (Closes: #6361)
-- Add listener for each email added to inbox in IncomingMail (Closes: #6742)
diff --git a/changes/feature-6617_attach_public_key b/changes/feature-6617_attach_public_key
deleted file mode 100644
index 49b444b..0000000
--- a/changes/feature-6617_attach_public_key
+++ /dev/null
@@ -1 +0,0 @@
-- add public key as attachment (Closes: #6617)
diff --git a/changes/feature_6996-post-sync-hooks b/changes/feature_6996-post-sync-hooks
deleted file mode 100644
index e03c28e..0000000
--- a/changes/feature_6996-post-sync-hooks
+++ /dev/null
@@ -1 +0,0 @@
-- Ability to reindex local UIDs after a soledad sync. Closes: #6996
diff --git a/changes/feature_adapt-to-new-events-on-common b/changes/feature_adapt-to-new-events-on-common
deleted file mode 100644
index e57e777..0000000
--- a/changes/feature_adapt-to-new-events-on-common
+++ /dev/null
@@ -1 +0,0 @@
-- Adapt to new events api on leap.common. Related to #5359.
diff --git a/changes/feature_send_bye b/changes/feature_send_bye
deleted file mode 100644
index 5bc3e60..0000000
--- a/changes/feature_send_bye
+++ /dev/null
@@ -1 +0,0 @@
-- Send a BYE command to all open connections, so that the MUA is notified when the server is shutted down.