From: R. David Murray <rdmurray@bitdance.com>
Date: Wed, 16 Dec 2009 15:21:43 +0000 (+0000)
Subject: Blocked revisions 76857 via svnmerge
X-Git-Tag: v3.1.2rc1~253
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4860288958483208eacb25a4dc1d144ac512e323;p=python

Blocked revisions 76857 via svnmerge

................
  r76857 | r.david.murray | 2009-12-16 10:19:27 -0500 (Wed, 16 Dec 2009) | 9 lines

  Merged revisions 76856 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r76856 | r.david.murray | 2009-12-16 06:49:46 -0500 (Wed, 16 Dec 2009) | 2 lines

    Issue #7396: fix -s, which was broken by the -j enhancement.
  ........
................
---