django/django — pull request #1768 by alasdairnicol (2013-10-18 00:57:42+00:00)
Title: Fixed #21268 -- Fixed E303 pep8 warnings

Note that this pull request contains whitespace changes to the bundled library django/utils/six.py. Is that ok, or will it cause difficulties when merging updates from the upstream version?