gistfile1.txt

What I did in pull/52
 - I tried first
    - git checkout -b pull_52 upstream/master
    - curl https://github.com/django/django/pull/52.patch | git am
   but I got merge errors and decided to go another route (git am --abort; git branch -d pull_52)
 - added remote (git remote add dstufft https://github.com/dstufft/django.git)
 - created a local branch as above
 - git merge --squash dstufft ticket/xxxxx
 - got conflict. At this point I used git blame to see why there was a conflicting smart_str() call removal, spotted the commit with git blame which said the smart_str() wasn't needed any more. Check!
 - committed the work so far.
 - checked the patch
    - git diff --check HEAD~1..HEAD for whitespace errors
    - ran tests
    - go through the code. Spotted that the object_list checking change wasn't 100% necessary
    - removed it by using git reset HEAD~1, and then git add -p
    - commit the added bits, discard rest (git checkout -- paths_to_discards)
    - commit again work, check again work
 - checkout master, merge --ff-only pull_52
 - git push --dry-run upstream master
 - check log so that commits are correct
 - finally, the real commit to django/django: git push upstream master