From 60bcc511b5d715b4921645cad6c82adfacf7ec24 Mon Sep 17 00:00:00 2001
From: Ivan Alejandro <ivanalejandro0@gmail.com>
Date: Mon, 26 Jan 2015 13:40:47 -0300
Subject: Fold in changes.

---
 CHANGELOG | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'CHANGELOG')

diff --git a/CHANGELOG b/CHANGELOG
index 8895de3..3c3c917 100644
--- 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.
-- 
cgit v1.2.3