Merge branch 'master' of github.com:django/django into schema-alteration

Conflicts:
	django/db/backends/postgresql_psycopg2/base.py

1 files changed, 3 insertions, 3 deletions

diff --git a/tests/regressiontests/conditional_processing/models.py b/tests/regressiontests/conditional_processing/models.py
index 97aeff5eaa..d1a8ac605b 100644
--- a/tests/regressiontests/conditional_processing/models.py
+++ b/tests/regressiontests/conditional_processing/models.py
@@ -143,14 +143,14 @@ class HttpDateProcessing(unittest.TestCase):
     def testParsingRfc1123(self):
         parsed = parse_http_date('Sun, 06 Nov 1994 08:49:37 GMT')
         self.assertEqual(datetime.utcfromtimestamp(parsed),
-                         datetime(1994, 11, 06, 8, 49, 37))
+                         datetime(1994, 11, 6, 8, 49, 37))
 
     def testParsingRfc850(self):
         parsed = parse_http_date('Sunday, 06-Nov-94 08:49:37 GMT')
         self.assertEqual(datetime.utcfromtimestamp(parsed),
-                         datetime(1994, 11, 06, 8, 49, 37))
+                         datetime(1994, 11, 6, 8, 49, 37))
 
     def testParsingAsctime(self):
         parsed = parse_http_date('Sun Nov  6 08:49:37 1994')
         self.assertEqual(datetime.utcfromtimestamp(parsed),
-                         datetime(1994, 11, 06, 8, 49, 37))
+                         datetime(1994, 11, 6, 8, 49, 37))