From: Joey Hess <joey@kitenet.net>
Date: Fri, 4 Oct 2013 16:36:21 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: debian/3.20140102~82
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/2e3d535c6b71a1a4784525730803bb1c3c5403e8?hp=1b64f369e3edc1b4e185c33380a8bbf88a41715a

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

diff --git a/doc/examples/blog/posts/Test.html b/doc/examples/blog/posts/Test.html
new file mode 100644
index 000000000..cd24af440
--- /dev/null
+++ b/doc/examples/blog/posts/Test.html
@@ -0,0 +1,3 @@
+test
+
+og hva nu?