]> granicus.if.org Git - python/commitdiff
Issue #22165: merge from 3.4
authorNed Deily <nad@acm.org>
Mon, 5 Jan 2015 09:05:36 +0000 (01:05 -0800)
committerNed Deily <nad@acm.org>
Mon, 5 Jan 2015 09:05:36 +0000 (01:05 -0800)

Trivial merge