From: Joey Hess <joey@kitenet.net>
Date: Thu, 14 Mar 2013 15:29:28 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/c8bc7dfa66a217d664ca0cd396853c84d22f6531?hp=030c7a4f8b06b097e18f638b0650baa966c50964

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

diff --git a/doc/test.mdwn b/doc/test.mdwn
deleted file mode 100644
index 8ae056963..000000000
--- a/doc/test.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-# Test