]> granicus.if.org Git - python/commitdiff
Issue #23212: merge from 3.4
authorNed Deily <nad@acm.org>
Fri, 9 Jan 2015 21:33:28 +0000 (13:33 -0800)
committerNed Deily <nad@acm.org>
Fri, 9 Jan 2015 21:33:28 +0000 (13:33 -0800)

Trivial merge