close

[ikiwiki.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index cd5d62eed7d87bfdf5b0f13bee173bcabcfccb86..dec033b7ca462a7cec82c4eef9ace916a3a7ac60 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,23 @@
-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.)
+  * 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>  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>  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