]> granicus.if.org Git - python/commitdiff
merge with 3.4
authorGeorg Brandl <georg@python.org>
Sun, 12 Oct 2014 14:13:38 +0000 (16:13 +0200)
committerGeorg Brandl <georg@python.org>
Sun, 12 Oct 2014 14:13:38 +0000 (16:13 +0200)
1  2 
Doc/library/urllib.parse.rst

Simple merge