Merged revisions 76785 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76785 | benjamin.peterson | 2009-12-13 08:18:08 -0600 (Sun, 13 Dec 2009) | 1 line

  add 2.6.x point releases
........

diff --git a/Doc/license.rst b/Doc/license.rst
index 7b77b60682f66f5820fe5c62446d726b41556fd5..9451be081d0f606c9f012e385b676e8116ad8dc7 100644 (file)
--- a/Doc/license.rst
+++ b/Doc/license.rst
@@ -98,6 +98,12 @@ been GPL-compatible; the table below summarizes the various releases.
 +----------------+--------------+------------+------------+-----------------+
 | 3.2            | 3.1          | 2009       | PSF        | yes             |
 +----------------+--------------+------------+------------+-----------------+
+| 2.6.2          | 2.6.1        | 2009      | PSF        | yes             |
++----------------+--------------+-----------+------------+-----------------+
+| 2.6.3          | 2.6.2        | 2009      | PSF        | yes             |
++----------------+--------------+-----------+------------+-----------------+
+| 2.6.4          | 2.6.3        | 2009      | PSF        | yes             |
++----------------+--------------+-----------+------------+-----------------+
 
 .. note::
 

diff --git a/LICENSE b/LICENSE
index 7a3857e0ff3141d55e3c44e95ad72816c4a76cb5..6c1ce01cba5ade4a35640183d0f066fd58c55d3a 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -59,6 +59,9 @@ the various releases.
     2.5.3           2.5.2       2008        PSF         yes
     2.6             2.5         2008        PSF         yes
     2.6.1           2.6         2008        PSF         yes
+    2.6.2           2.6.1       2009        PSF         yes
+    2.6.3           2.6.2       2009        PSF         yes
+    2.6.4           2.6.3       2009        PSF         yes
     3.0             2.6         2008        PSF         yes
     3.1             3.0         2009        PSF         yes
     3.2             3.1         2009        PSF         yes