Skip to content
Commit 71ae6cbf authored by Karen Tracey's avatar Karen Tracey
Browse files

[1.0.X] block [9248] (feature) and [9263] (updated translation) from svnmerge consideration. 


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9274 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 74c799d2
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