]> granicus.if.org Git - python/commitdiff
Issue #3485: merge from 3.4
authorNed Deily <nad@acm.org>
Wed, 18 Jun 2014 20:10:44 +0000 (13:10 -0700)
committerNed Deily <nad@acm.org>
Wed, 18 Jun 2014 20:10:44 +0000 (13:10 -0700)

Trivial merge