[1.0.X] Blocked non-bugfix changesets from svnmerge.py consideration.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9638 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
349405009f
commit
02b15e87d2