]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge heads
authorYury Selivanov <yury@magic.io>
Thu, 15 Sep 2016 17:26:58 +0000 (13:26 -0400)
committerYury Selivanov <yury@magic.io>
Thu, 15 Sep 2016 17:26:58 +0000 (13:26 -0400)

Trivial merge