]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge with 3.4
authorZachary Ware <zachary.ware@gmail.com>
Thu, 27 Nov 2014 04:58:25 +0000 (22:58 -0600)
committerZachary Ware <zachary.ware@gmail.com>
Thu, 27 Nov 2014 04:58:25 +0000 (22:58 -0600)

Trivial merge