X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/9a1c60c9c63eafe11b9e6d14329c76e97d2c9f11..29f9c2b5bad32b1135fae53134e87e2b8e68dc31:/debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 1db98647e..07d99e202 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,25 @@
-ikiwiki (3.20140126) UNRELEASED; urgency=medium
+ikiwiki (3.20140815) unstable; 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.)
+  * highlight: Add compatability with highlight 3.18, while still supporting
+    3.9+. Closes: #757679
+    Thanks, David Bremner
+  * highlight: Add support for multiple language definition directories
+    Closes: #757680
+    Thanks, David Bremner
+
+ -- Joey Hess <joeyh@debian.org>  Fri, 15 Aug 2014 12:58:08 -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
@@ -26,7 +47,7 @@ ikiwiki (3.20140126) UNRELEASED; urgency=medium
   * 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