django/django — pull request #556 by chrismedrela (2012-11-25 19:59:34+00:00)
Title: Fixed #17673 -- forbidding field shadowing

This is updated version of a patch written 7 months ago; it applies
clearly.