]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
#18466: merge with 3.3.
authorEzio Melotti <ezio.melotti@gmail.com>
Sat, 17 Aug 2013 13:58:13 +0000 (16:58 +0300)
committerEzio Melotti <ezio.melotti@gmail.com>
Sat, 17 Aug 2013 13:58:13 +0000 (16:58 +0300)
1  2 
Lib/collections/__init__.py
Lib/test/datetimetester.py
Lib/test/test_ast.py
Lib/test/test_normalization.py
Lib/test/test_urllib.py
Misc/HISTORY
Modules/_ssl.c
Modules/_winapi.c
PCbuild/readme.txt

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc Misc/HISTORY
Simple merge
diff --cc Modules/_ssl.c
Simple merge
Simple merge
Simple merge