]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Issues #21948 and #16040: Merge with 3.4.
authorBerker Peksag <berker.peksag@gmail.com>
Wed, 9 Jul 2014 17:16:23 +0000 (20:16 +0300)
committerBerker Peksag <berker.peksag@gmail.com>
Wed, 9 Jul 2014 17:16:23 +0000 (20:16 +0300)

Trivial merge