From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 12 May 2009 17:30:54 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/0162d9f614a4ccd79db89aa1a5a3453089df0680?hp=72e074d8958e36b4859f28f0996bed42c71d9cb0

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

diff --git a/doc/news/version_3.13.mdwn b/doc/news/version_3.13.mdwn
new file mode 100644
index 000000000..fad417faa
--- /dev/null
+++ b/doc/news/version_3.13.mdwn
@@ -0,0 +1,6 @@
+ikiwiki 3.13 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * ikiwiki-transition: If passed a nonexistant srcdir, or one not
+     containing .ikiwiki, abort with an error rather than creating it.
+   * Allow underlaydir to be overridden without messing up inclusion
+     of other underlays via add\_underlay."""]]
\ No newline at end of file