Commit a04fd1ef authored by Karen Tracey's avatar Karen Tracey
Browse files

[1.0.X] Updated blocked and merged metadata for svnmerge.py. 


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10794 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent e21c85c5

There are no changes