Skip to content
Commit 0b527508 authored by Karen Tracey's avatar Karen Tracey
Browse files

[1.1.X] Update svnmerge metadata to relfect things that have been and should not be merged. 


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12233 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent a0ccd506
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment