django/django — pull request #1257 by chrismedrela (2013-06-09 17:59:15+00:00)
Title: Fixed #17673 -- forbidding field shadowing

Now the patch applies clearly. The old pull request is: https://github.com/django/django/pull/556