]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3f063a5 5feeeba)
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Mon, 29 Dec 2014 04:14:23 +0000 (22:14 -0600)
committerBenjamin Peterson <benjamin@python.org>
Mon, 29 Dec 2014 04:14:23 +0000 (22:14 -0600)
1  2 
Doc/library/ipaddress.rst patch | diff1 | diff2 | blob | history

diff --cc Doc/library/ipaddress.rst
Simple merge
Unnamed repository; edit this file 'description' to name the repository.