]> granicus.if.org Git - python/commitdiff
Merge heads.
authorRoger Serwy <roger.serwy@gmail.com>
Sun, 31 Mar 2013 21:11:51 +0000 (16:11 -0500)
committerRoger Serwy <roger.serwy@gmail.com>
Sun, 31 Mar 2013 21:11:51 +0000 (16:11 -0500)
1  2 
Misc/NEWS

diff --cc Misc/NEWS
Simple merge