]> granicus.if.org Git - python/commitdiff
merge with 3.2
authorSandro Tosi <sandro.tosi@gmail.com>
Tue, 16 Aug 2011 18:03:50 +0000 (20:03 +0200)
committerSandro Tosi <sandro.tosi@gmail.com>
Tue, 16 Aug 2011 18:03:50 +0000 (20:03 +0200)
1  2 
Doc/license.rst

diff --cc Doc/license.rst
Simple merge