granicus.if.org Git - python/commit

]> granicus.if.org Git - python/commit

projects / python / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: e0c6916 85a8629)

author	Ezio Melotti <ezio.melotti@gmail.com>
	Sat, 17 Aug 2013 13:58:13 +0000 (16:58 +0300)
committer	Ezio Melotti <ezio.melotti@gmail.com>
	Sat, 17 Aug 2013 13:58:13 +0000 (16:58 +0300)
commit	a7e7497d885b5616fbe9bd4b16778f9e0e50b07d
tree	5e1e28b27364065e3f3f6ea06df67ad5e1228531	tree \| snapshot
parent	e0c69161bc9d4e9deca4fc0add189b4df9cce8cb	commit \| diff
parent	85a8629d2134969fc9c35b56509d3a76d9dccecf	commit \| diff

#18466: merge with 3.3.

Lib/collections/__init__.py	diff1 \|	diff2 \|	blob \| history
Lib/test/datetimetester.py	diff1 \|	diff2 \|	blob \| history
Lib/test/test_ast.py	diff1 \|	diff2 \|	blob \| history
Lib/test/test_normalization.py	diff1 \|	diff2 \|	blob \| history
Lib/test/test_urllib.py	diff1 \|	diff2 \|	blob \| history
Misc/HISTORY	diff1 \|	diff2 \|	blob \| history
Modules/_ssl.c	diff1 \|	diff2 \|	blob \| history
Modules/_winapi.c	diff1 \|	diff2 \|	blob \| history
PCbuild/readme.txt	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.