]> granicus.if.org Git - python/commitdiff
Merge heads
authorMartin v. Löwis <martin@v.loewis.de>
Fri, 28 Feb 2014 14:47:15 +0000 (15:47 +0100)
committerMartin v. Löwis <martin@v.loewis.de>
Fri, 28 Feb 2014 14:47:15 +0000 (15:47 +0100)
1  2 
Misc/NEWS

diff --cc Misc/NEWS
Simple merge