Django

Code

Show
Ignore:
Timestamp:
11/06/07 16:25:59 (1 year ago)
Author:
jkocherhans
Message:

newforms-admin: Merged to [6652]

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/newforms-admin

    • Property svnmerge-integrated changed from /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-6612 to /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-6655

  • django/branches/newforms-admin/django/utils/dateformat.py

    r6371 r6656  
    171171 
    172172    def r(self): 
    173         "RFC 822 formatted date; e.g. 'Thu, 21 Dec 2000 16:01:07 +0200'" 
     173        "RFC 2822 formatted date; e.g. 'Thu, 21 Dec 2000 16:01:07 +0200'" 
    174174        return self.format('D, j M Y H:i:s O') 
    175175