Merge branch 'master' into debian-jessie-backports

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

diff --git a/debian/NEWS b/debian/NEWS
index c1f343520fa65a970c6d3eeaf2c56ffa28bb6316..b2753c638f5580aa5b6594f598715dbcd3cd4272 100644 (file)
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,4 +1,4 @@
-ikiwiki (3.20150330) UNRELEASED; urgency=medium
+ikiwiki (3.20150610) unstable; urgency=low
 
   The new "emailauth" plugin allows users to authenticate using an email
   address, without otherwise creating an account.
@@ -8,7 +8,7 @@ ikiwiki (3.20150330) UNRELEASED; urgency=medium
   Conversely, if emailauth is required on a wiki that does not enable
   openid, you can list it in the enable_plugins setting.
 
- -- Simon McVittie <smcv@debian.org>  Wed, 27 May 2015 08:30:43 +0100
+ -- Simon McVittie <smcv@debian.org>  Wed, 10 Jun 2015 21:56:56 +0100
 
 ikiwiki (3.20150107) experimental; urgency=medium