Fold in changes.

diff --git a/CHANGELOG b/CHANGELOG
index 8895de3..3c3c917 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+0.3.10 Jan 26, 2015:
+  o Consider different possibilities for tmpdir. Related to #6631.
+  o Add support for deferreds to memoize_method decorator
+  o Extract the environment set up and tear down for tests
+
 0.3.9 Jul 18, 2014:
   o Include pemfile in the package data. Closes #5897.
   o Look for bundled cacert.pem in the Resources dir for OSX.

diff --git a/changes/bug_tempdir-alternatives b/changes/bug_tempdir-alternatives
deleted file mode 100644 (file)
index 579d880..0000000
--- a/changes/bug_tempdir-alternatives
+++ /dev/null
@@ -1 +0,0 @@
-- Consider different possibilities for tmpdir. Related to #6631.

diff --git a/changes/feature-memoize_deferred b/changes/feature-memoize_deferred
deleted file mode 100644 (file)
index dd2fdee..0000000
--- a/changes/feature-memoize_deferred
+++ /dev/null
@@ -1 +0,0 @@
-- Add support for deferreds to memoize_method decorator

diff --git a/changes/feature-test_env b/changes/feature-test_env
deleted file mode 100644 (file)
index 77614d7..0000000
--- a/changes/feature-test_env
+++ /dev/null
@@ -1 +0,0 @@
-- Extract the environment set up and tear down for tests