Django

Code

Show
Ignore:
Timestamp:
02/08/08 14:57:56 (1 year ago)
Author:
jbronn
Message:

gis: Merged revisions 7044-7102 via svnmerge from trunk.

Files:

Legend:

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

    • Property svnmerge-integrated changed from /django/trunk:1-7043 to /django/trunk:1-7102
  • django/branches/gis/django/utils/feedgenerator.py

    r6615 r7103  
    5454            'link': iri_to_uri(link), 
    5555            'description': to_unicode(description), 
    56             'language': force_unicode(language), 
     56            'language': to_unicode(language), 
    5757            'author_email': to_unicode(author_email), 
    5858            'author_name': to_unicode(author_name),