]> granicus.if.org Git - python/commit
merge with 3.4
authorGeorg Brandl <georg@python.org>
Tue, 28 Oct 2014 21:45:36 +0000 (22:45 +0100)
committerGeorg Brandl <georg@python.org>
Tue, 28 Oct 2014 21:45:36 +0000 (22:45 +0100)
commit95517e4aeeb2bc8c498d9905da9a7ab8f5ab52ec
tree89ff39e86c8d69179d8b2a104324c869685cc226
parent96d836833e4a5dc02d304d1e05df4741bdf38037
parent2b07b0e8683b248b82d09bf1f0dbd3bd09e7af72
merge with 3.4
Doc/library/socket.rst