]> granicus.if.org Git - python/commitdiff
Issue 21069: merge from 3.4
authorNed Deily <nad@acm.org>
Thu, 27 Mar 2014 08:40:16 +0000 (01:40 -0700)
committerNed Deily <nad@acm.org>
Thu, 27 Mar 2014 08:40:16 +0000 (01:40 -0700)

Trivial merge