]> granicus.if.org Git - python/commitdiff
Issue #20939: merge from 3.4
authorNed Deily <nad@acm.org>
Thu, 27 Mar 2014 06:44:18 +0000 (23:44 -0700)
committerNed Deily <nad@acm.org>
Thu, 27 Mar 2014 06:44:18 +0000 (23:44 -0700)

Trivial merge