Merge branch 'master' into dependency-types

Conflicts:
	doc/bugs/transitive_dependencies.mdwn

2 files changed, 14 insertions, 7 deletions

diff --git a/doc/news/version_3.1415.mdwn b/doc/news/version_3.1415.mdwn
deleted file mode 100644
index 93310bc64..000000000
--- a/doc/news/version_3.1415.mdwn
+++ /dev/null
@@ -1,7 +0,0 @@
-ikiwiki 3.1415 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * img: Fix extra double quote with alt text. (smcv)
-   * Updated French debconf templates translation. Closes: #[535103](http://bugs.debian.org/535103)
-   * openid: Support Net::OpenID 2.x when pretty-printing
-     openids. (smcv)
-   * highlight: Fix utf-8 encoding bug. Closes: #[535028](http://bugs.debian.org/535028)"""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20091009.mdwn b/doc/news/version_3.20091009.mdwn
new file mode 100644
index 000000000..9ab1299b9
--- /dev/null
+++ b/doc/news/version_3.20091009.mdwn
@@ -0,0 +1,14 @@
+ikiwiki 3.20091009 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * parentlinks: Add has\_parentlinks template parameter to allow styling
+     the toplevel index differently etc.
+   * img: Correct bug in image size calculation code.
+   * img: Fix dependency code for full size images.
+   * toggle, relativedate: Support templates that add attributes
+     to the body tag.
+   * Support RPC::XML 0.69's incompatible object instantiation method.
+   * mirrorlist: Display nothing if list is empty.
+   * Fix a bug that could lead to duplicate links being recorded
+     for tags.
+   * Optimize away most expensive file prune calls, when refreshing,
+     by only checking new files."""]]
\ No newline at end of file