From: Georg Brandl <georg@python.org>
Date: Sat, 6 Apr 2013 14:47:34 +0000 (+0200)
Subject: merge with 3.3
X-Git-Tag: v3.4.0a1~1023
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=98297f4807eea84f0d671cad6ce5c96bc9f3d9cb;p=thirdparty%2FPython%2Fcpython.git

merge with 3.3
---

98297f4807eea84f0d671cad6ce5c96bc9f3d9cb
diff --cc Doc/license.rst
index 3508d544700e,9e80f5dbaaef..c3d5d75ef224
--- a/Doc/license.rst
+++ b/Doc/license.rst
@@@ -120,10 -120,10 +120,12 @@@ been GPL-compatible; the table below su
  +----------------+--------------+------------+------------+-----------------+
  | 3.2.3          | 3.2.2        | 2012       | PSF        | yes             |
  +----------------+--------------+------------+------------+-----------------+
+ | 3.2.4          | 3.2.3        | 2013       | PSF        | yes             |
+ +----------------+--------------+------------+------------+-----------------+
  | 3.3.0          | 3.2          | 2012       | PSF        | yes             |
  +----------------+--------------+------------+------------+-----------------+
 +| 3.4.0          | 3.3.0        | 2014       | PSF        | yes             |
 ++----------------+--------------+------------+------------+-----------------+
  
  .. note::
  
diff --cc LICENSE
index 971640548229,2d565c921c36..3e8460d6a689
--- a/LICENSE
+++ b/LICENSE
@@@ -74,8 -74,8 +74,9 @@@ the various releases
      3.2.1           3.2         2011        PSF         yes
      3.2.2           3.2.1       2011        PSF         yes
      3.2.3           3.2.2       2012        PSF         yes
+     3.2.4           3.2.3       2013        PSF         yes
      3.3.0           3.2         2012        PSF         yes
 +    3.4.0           3.3.0       2014        PSF         yes
  
  Footnotes:
  
diff --cc Lib/idlelib/NEWS.txt
index 245d72d50577,54507015a1ee..478c18337ee5
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@@ -4,8 -4,12 +4,10 @@@ What's New in IDLE 3.4.0
  - Issue #17390: Display Python version on Idle title bar.
    Initial patch by Edmond Burnett.
  
 -
 -What's New in IDLE 3.3.1?
 -=========================
 +- Issue #5066: Update IDLE docs. Patch by Todd Rovito.
  
+ - Issue #17625: Close the replace dialog after it is used.
+ 
  - Issue #16226: Fix IDLE Path Browser crash.
    (Patch by Roger Serwy)