granicus.if.org Git - python/commit

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

projects / python / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 458fc6f 82f34ad)

author	Benjamin Peterson <benjamin@python.org>
	Tue, 13 Jan 2015 14:20:31 +0000 (09:20 -0500)
committer	Benjamin Peterson <benjamin@python.org>
	Tue, 13 Jan 2015 14:20:31 +0000 (09:20 -0500)
commit	610bc6a211be33b390a9910943f1f9fb7656f634
tree	9498dd48c73ea91305805a6e1967f32becd39d70	tree \| snapshot
parent	458fc6f98ca9a838af5dcdff64fd48ae3eb64fa9	commit \| diff
parent	82f34ada45f96c13eb68927d6beccdcbab2c77b3	commit \| diff

merge 3.4 (#23221)

Doc/c-api/exceptions.rst	diff1 \|	diff2 \|	blob \| history
Doc/c-api/init.rst	diff1 \|	diff2 \|	blob \| history
Doc/distutils/apiref.rst	diff1 \|	diff2 \|	blob \| history
Doc/library/unittest.mock.rst	diff1 \|	diff2 \|	blob \| history
Lib/http/cookiejar.py	diff1 \|	diff2 \|	blob \| history
Lib/socket.py	diff1 \|	diff2 \|	blob \| history
Lib/test/test_argparse.py	diff1 \|	diff2 \|	blob \| history
Misc/ACKS	diff1 \|	diff2 \|	blob \| history

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