]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorChristian Heimes <christian@cheimes.de>
Wed, 19 Jun 2013 00:09:00 +0000 (02:09 +0200)
committerChristian Heimes <christian@cheimes.de>
Wed, 19 Jun 2013 00:09:00 +0000 (02:09 +0200)
1  2 
Misc/NEWS

diff --cc Misc/NEWS
Simple merge