From: Joey Hess <joey@kitenet.net>
Date: Thu, 7 Mar 2013 14:44:08 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20130504~62
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/263db21b0f9627d02224487bd1e3e37cc8e13957?hp=da85524efd075a1c9662945e5e2b1bc0a9d3f1b7

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