]> granicus.if.org Git - python/commitdiff
merge with 3.3
authorGeorg Brandl <georg@python.org>
Sun, 22 Sep 2013 09:46:51 +0000 (11:46 +0200)
committerGeorg Brandl <georg@python.org>
Sun, 22 Sep 2013 09:46:51 +0000 (11:46 +0200)
1  2 
Doc/license.rst

diff --cc Doc/license.rst
Simple merge