]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Issue #21688: Merge with 3.4
authorZachary Ware <zachary.ware@gmail.com>
Tue, 10 Jun 2014 17:08:20 +0000 (12:08 -0500)
committerZachary Ware <zachary.ware@gmail.com>
Tue, 10 Jun 2014 17:08:20 +0000 (12:08 -0500)

Trivial merge