Merge commit 'upstream/master' into prv/po

Conflicts:

	IkiWiki/Plugin/editpage.pm
	debian/control
	debian/copyright
	doc/todo/need_global_renamepage_hook.mdwn

Signed-off-by: intrigeri <intrigeri@boum.org>

3 files changed, 4 insertions, 25 deletions

diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn
index ad76606aa..45414142c 100644
--- a/doc/news/openid.mdwn
+++ b/doc/news/openid.mdwn
@@ -10,4 +10,4 @@ log back in, try out the OpenID signup process if you don't already have an
 OpenID, and see how OpenID works for you. And let me know your feelings about
 making such a switch. --[[Joey]]
 
-[[!poll 59 "Accept only OpenID for logins" 18 "Accept only password logins" 35 "Accept both"]]
+[[!poll 60 "Accept only OpenID for logins" 18 "Accept only password logins" 35 "Accept both"]]
diff --git a/doc/news/version_3.02.mdwn b/doc/news/version_3.02.mdwn
deleted file mode 100644
index f4e17a375..000000000
--- a/doc/news/version_3.02.mdwn
+++ /dev/null
@@ -1,24 +0,0 @@
-ikiwiki 3.02 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * blogspam: New plugin, adding spam filtering for page editing / comment
-     posting using the BlogSpam.net API.
-   * Add auto-blog.setup, which will set up an ikiwiki instance tuned for use
-     in blogging.
-   * checkcontent: New hook, can be used to implement arbitrary content
-     filters, including spam filters.
-   * table: Fix misparsed links in external files.
-   * table: Find links in external files in scan pass.
-   * rename: Show full names of affected pages.
-   * comments: Fix cache avoidance hack.
-   * repolist: New plugin to support the rel=vcs-* microformat.
-   * goodstuff: Include repolist by default. (But it does nothing until
-     configured with the repository locations.)
-   * comments: Add support for removing comments via web interface. (smcv)
-   * Consistently allow use of relative paths in all PageSpecs
-     that take a page name parameter. Previously, match\_created\_before(),
-     match\_created\_after(), match\_sourcepage(), and match\_destpage()
-     did not support that, and the docs were not clear.
-   * pinger: Get whole url, don't just head, avoids problems on
-     the nostromo web server.
-   * Recommend libterm-readline-gnu-perl since that makes auto.setup
-     behave better."""]]
\ No newline at end of file
diff --git a/doc/news/version_3.06.mdwn b/doc/news/version_3.06.mdwn
new file mode 100644
index 000000000..0e2a48fe6
--- /dev/null
+++ b/doc/news/version_3.06.mdwn
@@ -0,0 +1,3 @@
+ikiwiki 3.06 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Setup automator: Fix bug in password comparison. Closes: #[517654](http://bugs.debian.org/517654)"""]]
\ No newline at end of file