[Python-checkins] r70501 - python/branches/release30-maint

[mark.dickinson]

Author: mark.dickinson
Date: Sat Mar 21 11:52:39 2009
New Revision: 70501

Log:
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
........


Modified:
   python/branches/release30-maint/   (props changed)