]> granicus.if.org Git - python/commit
Fix Misc/NEWS merge conflict, hurray
authorChristian Heimes <christian@cheimes.de>
Tue, 22 Oct 2013 08:45:31 +0000 (10:45 +0200)
committerChristian Heimes <christian@cheimes.de>
Tue, 22 Oct 2013 08:45:31 +0000 (10:45 +0200)
commitd1d7576fb4a6787e3ebc0b5060561c076c9a4bf7
tree4700b5fe115d79123b6490bba8f5a56cd8380165
parentefa48676d52c8b45eaf832c3cdccad5597a30884
Fix Misc/NEWS merge conflict, hurray
Misc/NEWS