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

master
Joey Hess 2008-03-14 18:55:34 -04:00
commit 6263c7c36c
1 changed files with 0 additions and 3 deletions

View File

@ -52,9 +52,6 @@ Bulleted list
* four
* five
----
Its a WikiWikiWorld!!
----
[[template id=note text="this is generated by the [[plugins/haiku]] plugin"]]