]> granicus.if.org Git - python/commitdiff
Merge.
authorCharles-François Natali <cf.natali@gmail.com>
Thu, 29 Aug 2013 17:27:17 +0000 (19:27 +0200)
committerCharles-François Natali <cf.natali@gmail.com>
Thu, 29 Aug 2013 17:27:17 +0000 (19:27 +0200)
1  2 
Lib/test/support/__init__.py
Lib/test/test_socket.py

Simple merge
Simple merge