From: Mark Dickinson <dickinsm@gmail.com>
Date: Sat, 21 Mar 2009 10:52:39 +0000 (+0000)
Subject: Blocked revisions 70500 via svnmerge
X-Git-Tag: 3.0~304
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5b7df4079ea1a0675b9a5136fdea9a3ace5f1916;p=thirdparty%2FPython%2Fcpython.git

Blocked revisions 70500 via svnmerge

........
  r70500 | mark.dickinson | 2009-03-21 10:51:42 +0000 (Sat, 21 Mar 2009) | 2 lines

  Remove remnants of svn conflict marker from Misc/NEWS
........
---