]> granicus.if.org Git - python/commitdiff
merge
authorChristian Heimes <christian@python.org>
Thu, 22 Sep 2016 14:54:06 +0000 (16:54 +0200)
committerChristian Heimes <christian@python.org>
Thu, 22 Sep 2016 14:54:06 +0000 (16:54 +0200)

Trivial merge