Merge pull request #124 from peterbe/upgrade-django1.4.1 · vaidik/playdoh@b1f457d

Commit

Merge pull request mozilla#124 from peterbe/upgrade-django1.4.1

upgrade to playdoh-lib for django-1.4.1

peterbe committed Aug 2, 2012

2 parents fbad813 + 74d9711 commit b1f457d

+1 −1		lib/python/django/__init__.py
+1 −4		lib/python/django/conf/project_template/project_name/settings.py
+4 −1		lib/python/django/contrib/admin/filters.py
+5 −5		lib/python/django/contrib/admin/options.py
+2 −1		lib/python/django/contrib/admin/static/admin/css/widgets.css
+1 −1		lib/python/django/contrib/admin/views/main.py
+2 −1		lib/python/django/contrib/auth/tests/forms.py
+2 −2		lib/python/django/contrib/markup/templatetags/markup.py
+6 −3		lib/python/django/contrib/staticfiles/storage.py
+6 −1		lib/python/django/core/files/images.py
+8 −1		lib/python/django/core/management/commands/testserver.py
+12 −3		lib/python/django/db/backends/mysql/base.py
+1 −1		lib/python/django/db/models/fields/related.py
+4 −14		lib/python/django/forms/fields.py
+7 −4		lib/python/django/forms/widgets.py
+12 −10		lib/python/django/http/__init__.py
+7 −0		lib/python/django/test/testcases.py
+14 −3		lib/python/django/views/debug.py
+6 −6		lib/python/django/views/decorators/debug.py