X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/9e1ad9037fe4cb54fb5eeb8b3ad65c6594b1c1d4..d10e62f955839a3232b1107b17cfa51568c8aee3:/debian/changelog

diff --git a/debian/changelog b/debian/changelog
index d91342595..5675670a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+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