[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
This commit is contained in:
parent
74c799d21d
commit
71ae6cbfa4