diff options
| author | Justin Bronn <jbronn@gmail.com> | 2008-08-05 17:15:33 +0000 |
|---|---|---|
| committer | Justin Bronn <jbronn@gmail.com> | 2008-08-05 17:15:33 +0000 |
| commit | aa239e3e5405933af6a29dac3cf587b59a099927 (patch) | |
| tree | ea2cbd139c9a8cf84c09e0b2008bff70e05927ef /django/utils/dateformat.py | |
| parent | 45b73c9a4685809236f84046cc7ffd32a50db958 (diff) | |
| download | django-attic/gis.tar.gz | |
gis: Merged revisions 7981-8001,8003-8011,8013-8033,8035-8036,8038-8039,8041-8063,8065-8076,8078-8139,8141-8154,8156-8214 via svnmerge from trunk.archive/attic/gisattic/gis
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@8215 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/utils/dateformat.py')
| -rw-r--r-- | django/utils/dateformat.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/django/utils/dateformat.py b/django/utils/dateformat.py index bfca46b3d5..8da9385f6c 100644 --- a/django/utils/dateformat.py +++ b/django/utils/dateformat.py @@ -13,7 +13,7 @@ Usage: from django.utils.dates import MONTHS, MONTHS_3, MONTHS_AP, WEEKDAYS, WEEKDAYS_ABBR from django.utils.tzinfo import LocalTimezone -from django.utils.translation import string_concat, ugettext as _ +from django.utils.translation import ugettext as _ from django.utils.encoding import force_unicode from calendar import isleap, monthrange import re, time |