]> granicus.if.org Git - python/commitdiff
merge
authorChristian Heimes <christian@cheimes.de>
Thu, 20 Sep 2012 10:43:24 +0000 (12:43 +0200)
committerChristian Heimes <christian@cheimes.de>
Thu, 20 Sep 2012 10:43:24 +0000 (12:43 +0200)
1  2 
Misc/NEWS

diff --cc Misc/NEWS
Simple merge