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 278bb2d84338d2f0e60a7b505534c02b4378987b..e7d3db5103e3a679bfb24a36439c022fadcaa099 100644 (file)
--- a/Doc/license.rst
+++ b/Doc/license.rst
@@ -96,6 +96,12 @@ been GPL-compatible; the table below summarizes the various releases.
 +----------------+--------------+-----------+------------+-----------------+
 | 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             |
++----------------+--------------+-----------+------------+-----------------+
 
 .. note::
 

diff --git a/LICENSE b/LICENSE
index 0f72a618c4093730e015e44be5e895cc22cc479a..4ddcf09c2e6e4c8c498ed816dc85b1bc363edac4 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
 
 Footnotes: