commit a4f988c2bde9c060b05758ef7c451e34c9b8caab
author Georg Brandl <georg@python.org> Sat Apr 06 16:49:23 2013 +0200
committer Georg Brandl <georg@python.org> Sat Apr 06 16:49:23 2013 +0200
tree 830c489d4b081bab5b506c15593c726ef574c5e9
parent 98297f4807eea84f0d671cad6ce5c96bc9f3d9cb
parent 03b273f4d19efd594a749402d3175bc65c8a250d

merge with 3.3

Doc/license.rst

diff --git a/Doc/license.rst b/Doc/license.rst
index c3d5d75..b09e9a8 100644
--- a/Doc/license.rst
+++ b/Doc/license.rst
@@ -124,6 +124,8 @@
 +----------------+--------------+------------+------------+-----------------+
 | 3.3.0          | 3.2          | 2012       | PSF        | yes             |
 +----------------+--------------+------------+------------+-----------------+
+| 3.3.1          | 3.3.0        | 2013       | PSF        | yes             |
++----------------+--------------+------------+------------+-----------------+
 | 3.4.0          | 3.3.0        | 2014       | PSF        | yes             |
 +----------------+--------------+------------+------------+-----------------+
 

LICENSE

diff --git a/LICENSE b/LICENSE
index 3e8460d..c9cb72c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -76,6 +76,7 @@
     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.3.1           3.3.0       2013        PSF         yes
     3.4.0           3.3.0       2014        PSF         yes
 
 Footnotes: