]> granicus.if.org Git - python/commit
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Mon, 3 Nov 2014 20:12:52 +0000 (15:12 -0500)
committerBenjamin Peterson <benjamin@python.org>
Mon, 3 Nov 2014 20:12:52 +0000 (15:12 -0500)
commit678e11aa22a401058f7f5ebb1fbd6fd6c9ec3b93
tree5843080a2166476796ed3cacf69c0bf5f6cf4f0f
parent1cca273669598978f6dfc1d1aad92e02a84bbe04
parent8d2d5b9c598d319bc209667f3ae8d2d5186ac82e
merge 3.4
Lib/test/test_socket.py