add branch, with a smoke-test for inline

[git.ikiwiki.info.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 0c36baf606f977e684d64d05e4321980fe1d98bf..11ad07712daee58cc6cf96c404348ae1f7252245 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,17 @@
-ikiwiki (3.20140228) 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.
 
   * 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>  Sat, 05 Apr 2014 19:08:22 -0400
+ -- Joey Hess <joeyh@debian.org>  Fri, 13 Jun 2014 10:09:10 -0400

 
 ikiwiki (3.20140227) unstable; urgency=medium
 
 
 ikiwiki (3.20140227) unstable; urgency=medium