django/django — pull request #1701 by manfre (2013-10-01 14:52:32+00:00)
Title: [1.5.x] Fixed #21203 -- resolve_columns fields misalignment

In queries using .defer() together with .select_related() the values
and fields arguments didn't align properly for resolve_columns().

Backpatch of 215b9b0405e649a7d6f175d9d91a7247144ebb3c from master.