]> granicus.if.org Git - python/commitdiff
merge heads
authorNed Deily <nad@acm.org>
Sun, 6 Dec 2015 05:00:57 +0000 (00:00 -0500)
committerNed Deily <nad@acm.org>
Sun, 6 Dec 2015 05:00:57 +0000 (00:00 -0500)

Trivial merge