]> granicus.if.org Git - python/commitdiff
Issue #14346: merge
authorNed Deily <nad@acm.org>
Sat, 17 Mar 2012 17:30:48 +0000 (10:30 -0700)
committerNed Deily <nad@acm.org>
Sat, 17 Mar 2012 17:30:48 +0000 (10:30 -0700)

Trivial merge