Django

Code

Show
Ignore:
Timestamp:
08/05/08 12:15:33 (5 months ago)
Author:
jbronn
Message:

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.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • django/branches/gis

    • Property svnmerge-integrated changed from /django/trunk:1-7978 to /django/trunk:1-8214
  • django/branches/gis/django/utils/dateformat.py

    r6672 r8215  
    1414from django.utils.dates import MONTHS, MONTHS_3, MONTHS_AP, WEEKDAYS, WEEKDAYS_ABBR 
    1515from django.utils.tzinfo import LocalTimezone 
    16 from django.utils.translation import string_concat, ugettext as _ 
     16from django.utils.translation import ugettext as _ 
    1717from django.utils.encoding import force_unicode 
    1818from calendar import isleap, monthrange