From: Joey Hess <joey@kitenet.net>
Date: Tue, 21 Feb 2012 17:05:36 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/b1968dbb24bbf9da41fce0cdaa64aa4495412c7c?hp=29ac3084bb4ba409ba2ad695690ebcb31497cfed

Merge branch 'master' of ssh://git.ikiwiki.info
---

diff --git a/debian/changelog b/debian/changelog
index 7eb34f8fe..2d9ffdb85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 ikiwiki (3.20120203) UNRELEASED; urgency=low
 
   * Fix a snail mail address. Closes: #659158
+  * openid-jquery.js: Update URL of Wordpress favicon. Closes: #660549
 
  -- Joey Hess <joeyh@debian.org>  Wed, 08 Feb 2012 16:07:00 -0400
 
diff --git a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
index c59be1edc..056110384 100644
--- a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
+++ b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
@@ -38,7 +38,7 @@ var providers_small = {
     },
     wordpress: {
         name: 'Wordpress',
-	icon: 'https://ddgw.s3.amazonaws.com/wordpress.org.ico',
+	icon: 'https://s2.wp.com/i/favicon.ico',
         label: 'Enter your Wordpress.com username:',
         url: 'http://{username}.wordpress.com/'
     },