From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 8 Sep 2008 21:56:45 +0000 (+0000)
Subject: Blocked revisions 66281-66282,66301,66310 via svnmerge
X-Git-Tag: v3.0rc1~60
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c321ecb08455242fd8e50e32a3307f40d1c50162;p=python

Blocked revisions 66281-66282,66301,66310 via svnmerge

........
  r66281 | josiah.carlson | 2008-09-06 22:53:58 -0500 (Sat, 06 Sep 2008) | 3 lines

  This fixes a small inconsistency between trunk and 3.0, closing bug 3764.
........
  r66282 | josiah.carlson | 2008-09-06 23:37:10 -0500 (Sat, 06 Sep 2008) | 3 lines

  undoing change that broke trunk.  Need to find a better solution to this.
........
  r66301 | facundo.batista | 2008-09-07 19:20:28 -0500 (Sun, 07 Sep 2008) | 4 lines


  Issue 3801.  Fixing a dumb error in the deprecated parse_qsl()
  function.  Tests added.
........
  r66310 | bill.janssen | 2008-09-08 11:37:24 -0500 (Mon, 08 Sep 2008) | 1 line

  incorporate fixes from issue 3162; SSL doc patch
........
---