From 6c584a00de76e3193cc514572974e8ae99212e9c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 23 Feb 2014 14:28:22 -0400
Subject: [PATCH] Cleanup of the openid login widget, including replacing of
 hotlinked images from openid providers with embedded, freely licensed
 artwork. Thanks, smcv

---
 debian/changelog                                               | 3 +++
 doc/bugs/do_not_let_big_brother_spy_on_our_users_on_login.mdwn | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f1e5ae990..7723f368e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,9 @@ ikiwiki (3.20140126) UNRELEASED; urgency=medium
   * Deal with nasty issue with gettext clobbering $@ while printing
     error message containing it.
     Thanks, smcv
+  * Cleanup of the openid login widget, including replacing of hotlinked
+    images from openid providers with embedded, freely licensed artwork.
+    Thanks, smcv
 
  -- Joey Hess <joeyh@debian.org>  Sat, 01 Feb 2014 16:53:35 -0400
 
diff --git a/doc/bugs/do_not_let_big_brother_spy_on_our_users_on_login.mdwn b/doc/bugs/do_not_let_big_brother_spy_on_our_users_on_login.mdwn
index 6fc1bf585..5c1e7b2ed 100644
--- a/doc/bugs/do_not_let_big_brother_spy_on_our_users_on_login.mdwn
+++ b/doc/bugs/do_not_let_big_brother_spy_on_our_users_on_login.mdwn
@@ -58,6 +58,8 @@ A simple fix would be to ship those icons with ikiwiki and serve them locally, b
 >>> drew my own for the rest.
 >>> [See it in use here](http://blueview.hosted.pseudorandom.co.uk/ikiwiki.cgi?do=prefs)
 >>> -s
+>>>>
+>>>> Awesome work Simon! I owe you a beer. [[merged|done]] --[[Joey]] 
 >>
 >> If people want the "real" logos, we could have some code to make IkiWiki
 >> download the favicons into transient underlay (which I think is
-- 
2.39.5