X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/f414cc17afa3a0691cf5a81069fc584d97bfaf7a..6660fd643bf3b65745d62b24cb16fef1b5205207:/debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 7fa1cbdf7..11ad07712 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,19 @@
-ikiwiki (3.20140126) UNRELEASED; urgency=medium
+ikiwiki (3.20140614) UNRELEASED; urgency=medium
+
+  * Add google back to openid selector. Apparently this has gotten a stay
+    of execution until April 2015. (It may continue to work until 2017.)
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 03 Jul 2014 16:19:40 -0400
+
+ikiwiki (3.20140613) unstable; urgency=medium
+
+  * only_committed_changes could fail in a git repository merged
+    with git merge -s ours.
+  * Remove google from openid selector, per http://xkcd.com/1361/
+
+ -- Joey Hess <joeyh@debian.org>  Fri, 13 Jun 2014 10:09:10 -0400
+
+ikiwiki (3.20140227) unstable; urgency=medium
 
   * Added useragent config setting. Closes: #737121
     Thanks, Tuomas Jormola
@@ -19,10 +34,14 @@ ikiwiki (3.20140126) UNRELEASED; urgency=medium
   * Cleanup of the openid login widget, including replacing of hotlinked
     images from openid providers with embedded, freely licensed artwork.
     Thanks, smcv
+  * Improve templates testing.
+    Thanks, smcv
+  * python proxy: Avoid utf-8 related crash.
+    Thanks, Antoine Beaupré
   * Special thanks to Simon McVittie for being the patchmeister for this
     release.
 
- -- Joey Hess <joeyh@debian.org>  Sat, 01 Feb 2014 16:53:35 -0400
+ -- Joey Hess <joeyh@debian.org>  Thu, 27 Feb 2014 11:55:35 -0400
 
 ikiwiki (3.20140125) unstable; urgency=medium