]> granicus.if.org Git - python/commitdiff
merge heads
authorChristian Heimes <christian@cheimes.de>
Wed, 19 Jun 2013 00:08:41 +0000 (02:08 +0200)
committerChristian Heimes <christian@cheimes.de>
Wed, 19 Jun 2013 00:08:41 +0000 (02:08 +0200)
1  2 
Misc/NEWS

diff --cc Misc/NEWS
Simple merge