summaryrefslogtreecommitdiff
path: root/CHANGES
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2013-01-09 21:35:48 -0600
committerBenjamin Peterson <benjamin@python.org>2013-01-09 21:35:48 -0600
commit64fdc268911058cf7408bf1534ca498b0b9b8b3b (patch)
tree02d494a9e18f029ec9a73e66d89056e7eb53728f /CHANGES
parent7b844babe0966dd2a60811d1592b657a60d5e0de (diff)
parentc1f0212390cdb8264371bc99d4c28c4dd6da1b84 (diff)
downloadsix-64fdc268911058cf7408bf1534ca498b0b9b8b3b.tar.gz
merge heads
Diffstat (limited to 'CHANGES')
-rw-r--r--CHANGES3
1 files changed, 3 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index 44c4d15..314a87e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -14,6 +14,9 @@ Development version
- Fix Jython detection.
+- Pull request #4: Add email_mime_multipart, email_mime_text, and
+ email_mime_base to six.moves.
+
1.2.0
-----