]> granicus.if.org Git - python/commitdiff
Merge with 3.4 (#23256)
authorZachary Ware <zachary.ware@gmail.com>
Sat, 17 Jan 2015 14:53:09 +0000 (08:53 -0600)
committerZachary Ware <zachary.ware@gmail.com>
Sat, 17 Jan 2015 14:53:09 +0000 (08:53 -0600)

Trivial merge