]> granicus.if.org Git - python/commitdiff
merge head
authorGregory P. Smith <greg@krypto.org>
Mon, 14 Dec 2015 04:06:35 +0000 (20:06 -0800)
committerGregory P. Smith <greg@krypto.org>
Mon, 14 Dec 2015 04:06:35 +0000 (20:06 -0800)

Trivial merge