Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 29 Dec 2010 17:08:18 +0000 (13:08 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 29 Dec 2010 17:08:18 +0000 (13:08 -0400)
doc/examples/blog/posts/ugachaka/discussion.mdwn [new file with mode: 0644]

diff --git a/doc/examples/blog/posts/ugachaka/discussion.mdwn b/doc/examples/blog/posts/ugachaka/discussion.mdwn
new file mode 100644 (file)
index 0000000..387db1f
--- /dev/null
@@ -0,0 +1 @@
+jackie chan vs chuck norris.