]> granicus.if.org Git - python/commitdiff
merge
authorChristian Heimes <christian@python.org>
Mon, 12 Sep 2016 08:48:55 +0000 (10:48 +0200)
committerChristian Heimes <christian@python.org>
Mon, 12 Sep 2016 08:48:55 +0000 (10:48 +0200)

Trivial merge