]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge with 3.4
authorZachary Ware <zachary.ware@gmail.com>
Tue, 6 May 2014 14:19:16 +0000 (09:19 -0500)
committerZachary Ware <zachary.ware@gmail.com>
Tue, 6 May 2014 14:19:16 +0000 (09:19 -0500)

Trivial merge