Merge branch 'dj18' into postdj18

core/models.py

@@ -2372,7 +2372,7 @@ class UserProfile(models.Model):
         
     def unglueitar(self):
         # construct the url
-        gravatar_url = "https://www.gravatar.com/avatar/" + hashlib.md5(self.user.username + '@unglue.it').hexdigest() + "?"
+        gravatar_url = "https://www.gravatar.com/avatar/" + hashlib.md5(urllib.quote_plus(self.user.username.encode('utf-8')) + '@unglue.it').hexdigest() + "?"
         gravatar_url += urllib.urlencode({'d':'wavatar', 's':'50'})
         return gravatar_url
         

requirements_versioned.pip

@@ -60,7 +60,6 @@ oauth2==1.5.211
 oauthlib==1.1.2
 paramiko==1.14.1
 postmonkey==1.0b
-pyasn1==0.1.4
 pycrypto==2.6
 pymarc==3.0.2
 pyparsing==2.0.3