From: Joey Hess <joey@kitenet.net>
Date: Mon, 3 Dec 2007 19:48:21 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
X-Git-Tag: 2.16~100
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/d3e190ecec67ae45891d8aee3e3c8af9fc9f8cf9?hp=b1d79117d2bb1484baaf9ef5ebfe614000bf1839

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

diff --git a/debian/changelog b/debian/changelog
index 109ea2081..5e2944152 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (2.16) UNRELEASED; urgency=low
+
+  * Remove .otl file from sandbox to avoid build ugliness. Closes: #454181
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 03 Dec 2007 14:47:36 -0500
+
 ikiwiki (2.15) unstable; urgency=low
 
   * Add a new ikiwiki-makerepo program, that automates setting up a repo
diff --git a/doc/sandbox/next__44___where_is_next.otl b/doc/sandbox/next__44___where_is_next.otl
deleted file mode 100644
index 52e52d733..000000000
--- a/doc/sandbox/next__44___where_is_next.otl
+++ /dev/null
@@ -1,5 +0,0 @@
-otl, lotl.
-dss
-
-x
-oméga	
\ No newline at end of file