Merge branch 'master' of ssh://git.ikiwiki.info

diff --git a/debian/changelog b/debian/changelog
index cd5d62eed7d87bfdf5b0f13bee173bcabcfccb86..5675670a840c68c8ecc4d1504c8e17b7a0150d87 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-ikiwiki (3.20140228) UNRELEASED; urgency=medium
+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
 

diff --git a/ikiwiki.spec b/ikiwiki.spec
index bd351f5b4c946177d08aea18e3e2809deca71ef9..74f6419dbbe4832a1a0f58675b598205d41cf585 100644 (file)
--- a/ikiwiki.spec
+++ b/ikiwiki.spec
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version: 3.20140227
+Version: 3.20140613
 Release:        1%{?dist}
 Summary:        A wiki compiler