]> granicus.if.org Git - python/commitdiff
Merge. Closes issue 17052.
authorMichael Foord <michael@voidspace.org.uk>
Mon, 11 Feb 2013 00:28:02 +0000 (00:28 +0000)
committerMichael Foord <michael@voidspace.org.uk>
Mon, 11 Feb 2013 00:28:02 +0000 (00:28 +0000)
1  2 
Misc/NEWS

diff --cc Misc/NEWS
Simple merge