]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge with 3.4
authorZachary Ware <zachary.ware@gmail.com>
Wed, 23 Jul 2014 19:40:27 +0000 (14:40 -0500)
committerZachary Ware <zachary.ware@gmail.com>
Wed, 23 Jul 2014 19:40:27 +0000 (14:40 -0500)

Trivial merge