Commit 69e228e8 authored by Karen Tracey's avatar Karen Tracey
Browse files

[1.0.X] Fixed svnmerge-blocked: block r10128-10135, not 10028-10135. 


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

There are no changes