Issue #5424: add tests for inet_ntoa, inet_ntop, inet_aton and inet_pton.

author Antoine Pitrou <solipsis@pitrou.net>

Mon, 19 Dec 2011 15:22:26 +0000 (16:22 +0100)

committer Antoine Pitrou <solipsis@pitrou.net>

Mon, 19 Dec 2011 15:22:26 +0000 (16:22 +0100)
author Antoine Pitrou <solipsis@pitrou.net>
Mon, 19 Dec 2011 15:22:26 +0000 (16:22 +0100)
committer Antoine Pitrou <solipsis@pitrou.net>
Mon, 19 Dec 2011 15:22:26 +0000 (16:22 +0100)
diff --cc Lib/test/test_socket.py
Simple merge
diff --cc Misc/ACKS

index f4924446c2179b5765eefaf8ad79b3bba8f6b36f,ef21b7f457911473a44718a5cea53a35b7791641..269518cb02587c3dbe97f33d4df9c14d14b8ab2d
--- 1/Misc/ACKS
--- 2/Misc/ACKS
+++ b/Misc/ACKS
@@@ -380,8 -352,8 +380,9 @@@ Filip Gruszczyńsk
   Michael Guravage
   Lars Gustäbel
   Thomas Güttler
+ +Jonas H.
   Barry Haddow
+ Philipp Hagemeister
   Paul ten Hagen
   Rasmus Hahn
   Peter Haight
author	Antoine Pitrou <solipsis@pitrou.net>
	Mon, 19 Dec 2011 15:22:26 +0000 (16:22 +0100)
committer	Antoine Pitrou <solipsis@pitrou.net>
	Mon, 19 Dec 2011 15:22:26 +0000 (16:22 +0100)
		1	2
Lib/test/test_socket.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history