django/django — pull request #2941 by c-schmitt (2014-07-22 17:49:40+00:00)
Title: Merge pull request #1 from django/master

m