summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2013-11-27 11:12:34 -0600
committerBenjamin Peterson <benjamin@python.org>2013-11-27 11:12:34 -0600
commit8f78eb74ad7e9e4e304f60e5eb17f4e29635b7c4 (patch)
treee1920725b6622319cc5504b904378c39c1c09c14
parentc032200edaa3656e4de0dd98ed28a31fb46d39e2 (diff)
downloadsix-8f78eb74ad7e9e4e304f60e5eb17f4e29635b7c4.tar.gz
update changelog for pr #21
-rw-r--r--CHANGES2
1 files changed, 2 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index 6ef6813..1e9eec5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,8 @@ This file lists the changes in each six version.
Development version
-------------------
+- Pull request #21: Add import mapping for urllib's proxy_bypass function.
+
- Issue #43: Add import mapping for the Python 2 xmlrpclib module.
- Issue #39: Add import mapping for the Python 2 thread module.