diff options
| author | Benjamin Peterson <benjamin@python.org> | 2013-11-27 11:14:59 -0600 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2013-11-27 11:14:59 -0600 |
| commit | b92f218239ea695f23bebe6659c150b166dfc281 (patch) | |
| tree | e1920725b6622319cc5504b904378c39c1c09c14 | |
| parent | 789cea6ec711307c9940fdc7f29d9af7bccb6afe (diff) | |
| parent | a189525e4798f9799945b5527963ca16c7028d38 (diff) | |
| download | six-b92f218239ea695f23bebe6659c150b166dfc281.tar.gz | |
merge old branch
| -rw-r--r-- | CHANGES | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -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. |