merge with 3.3

diff --cc Doc/license.rst
index c3d5d75ef224f613f582d243a19978d7d71b59a8,aacfaa108cea0197c3ad65f9e65e34413c09b168..b09e9a8176e5dbdebdd0f6117fe87512b653c3ba
--- 1/Doc/license.rst
--- 2/Doc/license.rst
+++ b/Doc/license.rst
@@@ -123,9 -123,9 +123,11 @@@ been GPL-compatible; the table below su
  | 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             |
 ++----------------+--------------+------------+------------+-----------------+
  
  .. note::
  

diff --cc LICENSE
index 3e8460d6a689e475fb7c3df9a25c7cea311d11b8,6cbd96334a7ce0589591f2e1225422eea6d46887..c9cb72c35daba61f9bee1aa258e6739113c966c4
--- 1/LICENSE
--- 2/LICENSE
+++ b/LICENSE
@@@ -76,7 -76,7 +76,8 @@@ 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
+     3.3.1           3.3.0       2013        PSF         yes
 +    3.4.0           3.3.0       2014        PSF         yes
  
  Footnotes: