Fold in changes

9 files changed, 17 insertions, 10 deletions

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 92da1573..e8d24c95 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -6,6 +6,23 @@ History
 2014
 ====
 
+0.6.0 July 18 -- the "nothing to see here" release:
++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+- Initial sync message is confusing. Closes #5875.
+- Use preferred provider on first run. Closes #5813.
+- Add TUF init repository and release tools. Closes #5864.
+- Add support for fingerprint-gui's polkit agent. Closes #5880.
+- Reroute DNS packets instead of blocking them, eliminating need to
+  muck around with resolv.conf. Closes #4633, #5655, #5738, #4823
+- Use inline decrypting for initial soledad syncrhonization, to wait
+  for secrets.
+- Add the ability to create an osx bundle with py2app. Closes #5845.
+- Split frontend/backend in different files. Closes #5719.
+- Implement ZMQ based messaging system. Closes #5733.
+- Launch the backend in a different process than the app. Closes
+  #5734.
+
 0.5.3 June 27 -- the "encrypt ALL THE THINGS" release:
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
diff --git a/changes/bug-5875_better-initial-sync-message b/changes/bug-5875_better-initial-sync-message
deleted file mode 100644
index 473093ed..00000000
--- a/changes/bug-5875_better-initial-sync-message
+++ /dev/null
@@ -1 +0,0 @@
-- Initial sync message is confusing. Closes #5875.
diff --git a/changes/feature-5813_wizard-providers-order b/changes/feature-5813_wizard-providers-order
deleted file mode 100644
index f4033d26..00000000
--- a/changes/feature-5813_wizard-providers-order
+++ /dev/null
@@ -1 +0,0 @@
-- Use preferred provider on first run. Closes #5813.
diff --git a/changes/feature-5864_create_TUF_release_tool b/changes/feature-5864_create_TUF_release_tool
deleted file mode 100644
index b9a4a3d5..00000000
--- a/changes/feature-5864_create_TUF_release_tool
+++ /dev/null
@@ -1 +0,0 @@
-- Add TUF init repository and release tools. Closes #5864.
diff --git a/changes/feature-5880_add-fingerprint-gui-polkit-support b/changes/feature-5880_add-fingerprint-gui-polkit-support
deleted file mode 100644
index c71093d5..00000000
--- a/changes/feature-5880_add-fingerprint-gui-polkit-support
+++ /dev/null
@@ -1 +0,0 @@
-- Add support for fingerprint-gui's polkit agent. Closes #5880.
diff --git a/changes/feature-reroute_dns_packets b/changes/feature-reroute_dns_packets
deleted file mode 100644
index beef3a1f..00000000
--- a/changes/feature-reroute_dns_packets
+++ /dev/null
@@ -1 +0,0 @@
-- reroute DNS packets instead of blocking them, eliminating need to muck around with resolv.conf. Closes #4633, #5655, #5738, #4823
\ No newline at end of file
diff --git a/changes/feature_decrypt-inline-bootstrap b/changes/feature_decrypt-inline-bootstrap
deleted file mode 100644
index 092d98ea..00000000
--- a/changes/feature_decrypt-inline-bootstrap
+++ /dev/null
@@ -1 +0,0 @@
-- Use inline decrypting for initial soledad syncrhonization, to wait for secrets.
diff --git a/changes/feature_package_osx b/changes/feature_package_osx
deleted file mode 100644
index cf5823bd..00000000
--- a/changes/feature_package_osx
+++ /dev/null
@@ -1 +0,0 @@
-- Add the ability to create an osx bundle with py2app. Closes #5845.
\ No newline at end of file
diff --git a/changes/refactor-changes b/changes/refactor-changes
deleted file mode 100644
index 3516f8c4..00000000
--- a/changes/refactor-changes
+++ /dev/null
@@ -1,3 +0,0 @@
-- Split frontend/backend in different files. Closes #5719.
-- Implement ZMQ based messaging system. Closes #5733.
-- Launch the backend in a different process than the app. Closes #5734.