[1.0.X] Block new function (and fixes to same) from snvmerge.py consideration.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9988 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Karen Tracey 2009-03-08 04:12:56 +00:00
parent fd5d0cdebb
commit 9c5eafe7d5

Diff Content Not Available