From: Joey Hess <joey@kitenet.net>
Date: Wed, 9 Feb 2011 17:22:52 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20110225~85
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/0c68cd556a7d2c7395aed2a4e101c0ced0e33726?hp=e67c43b0aecf382500cd3913d80d3be49d11975e

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

diff --git a/doc/examples/blog/posts/kjkl.mdwn b/doc/examples/blog/posts/kjkl.mdwn
deleted file mode 100644
index 3edaef1bf..000000000
--- a/doc/examples/blog/posts/kjkl.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-new post