[1.0.X] Corrected svnmerge-integrated property from r10086, updated to include some recent changes.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10087 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Russell Keith-Magee 2009-03-18 12:38:39 +00:00
parent f781205859
commit 083a7206e4

Diff Content Not Available