Merge c3ec8f9db8 into 1490df7f55

tests.py

@@ -34,7 +34,7 @@ class UserModelCase(unittest.TestCase):
         u = User(username='john', email='john@example.com')
         self.assertEqual(u.avatar(128), ('https://www.gravatar.com/avatar/'
                                          'd4c74594d841139328695756648b6bd6'
-                                         '?d=identicon&s=128'))
+                                         '?id=identicon&s=128'))
 
     def test_follow(self):
         u1 = User(username='john', email='john@example.com')