[Python-checkins] r76787 - in python/branches/py3k: Doc/license.rst LICENSE

[benjamin.peterson]

Author: benjamin.peterson
Date: Sun Dec 13 15:21:46 2009
New Revision: 76787

Log:
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
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Doc/license.rst
   python/branches/py3k/LICENSE

Modified: python/branches/py3k/Doc/license.rst
==============================================================================
--- python/branches/py3k/Doc/license.rst	(original)
+++ python/branches/py3k/Doc/license.rst	Sun Dec 13 15:21:46 2009
@@ -98,6 +98,12 @@
 +----------------+--------------+------------+------------+-----------------+
 | 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::
 

Modified: python/branches/py3k/LICENSE
==============================================================================
--- python/branches/py3k/LICENSE	(original)
+++ python/branches/py3k/LICENSE	Sun Dec 13 15:21:46 2009
@@ -59,6 +59,9 @@
     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