]> granicus.if.org Git - python/commitdiff
Merge with 3.4; Closes #22315
authorJason R. Coombs <jaraco@jaraco.com>
Sun, 31 Aug 2014 22:02:18 +0000 (18:02 -0400)
committerJason R. Coombs <jaraco@jaraco.com>
Sun, 31 Aug 2014 22:02:18 +0000 (18:02 -0400)

Trivial merge