summaryrefslogtreecommitdiff
path: root/Doc/license.rst
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2013-04-06 16:39:49 +0200
committerGeorg Brandl <georg@python.org>2013-04-06 16:39:49 +0200
commit2fd4abe6a1f54fe7a5409abf84060bae47a52044 (patch)
tree3871af699874a89e1b687e9d1a106f880904d313 /Doc/license.rst
parent9a411ce9ea01017691ceb0c19ea1c8d1d1c34f4a (diff)
parent11692acffa7adfa3856ef4cd58140a20905f5016 (diff)
downloadcpython-git-2fd4abe6a1f54fe7a5409abf84060bae47a52044.tar.gz
merge with 3.2 branch
Diffstat (limited to 'Doc/license.rst')
-rw-r--r--Doc/license.rst2
1 files changed, 2 insertions, 0 deletions
diff --git a/Doc/license.rst b/Doc/license.rst
index 5b7fcbd2c4..9e80f5dbaa 100644
--- a/Doc/license.rst
+++ b/Doc/license.rst
@@ -120,6 +120,8 @@ been GPL-compatible; the table below summarizes the various releases.
+----------------+--------------+------------+------------+-----------------+
| 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 |
+----------------+--------------+------------+------------+-----------------+