Merge branch 'master' into po

Conflicts:
	debian/control

3 files changed, 7 insertions, 11 deletions

diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn
index 45414142c..c2a871f0a 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 60 "Accept only OpenID for logins" 18 "Accept only password logins" 35 "Accept both"]]
+[[!poll 61 "Accept only OpenID for logins" 18 "Accept only password logins" 36 "Accept both"]]
diff --git a/doc/news/version_3.07.mdwn b/doc/news/version_3.07.mdwn
deleted file mode 100644
index fbd448ddc..000000000
--- a/doc/news/version_3.07.mdwn
+++ /dev/null
@@ -1,10 +0,0 @@
-ikiwiki 3.07 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * Updated German translation (Kai Wasserbäch). Closes: #[518377](http://bugs.debian.org/518377)
-   * Updated French translation (Jean-Luc Coulon). Closes: #[518510](http://bugs.debian.org/518510)
-   * wmd: New plugin contributed by William Uther to support the WMD
-     Wysiwym markdown editor.
-   * smiley: Avoid infinite loop in smiley expansion triggered
-     by the template scan mode change in version 3.05. Closes: #[518805](http://bugs.debian.org/518805)
-   * template: When loading a template in scan mode, let preprocess
-     know it only needs to scan."""]]
\ No newline at end of file
diff --git a/doc/news/version_3.08.mdwn b/doc/news/version_3.08.mdwn
new file mode 100644
index 000000000..06d795c23
--- /dev/null
+++ b/doc/news/version_3.08.mdwn
@@ -0,0 +1,6 @@
+ikiwiki 3.08 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * git: Fix utf-8 encoding of author names.
+   * git: Manually decode git output from utf-8, avoids
+     warning messages on invalidly encoded output.
+   * Fix bug that caused weird things to appear as page types."""]]
\ No newline at end of file