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

diff --git a/websetup.pm b/websetup.pm
deleted file mode 120000 (symlink)
index 8ca7a8a..0000000
--- a/websetup.pm
+++ /dev/null
@@ -1 +0,0 @@
-/home/joey/src/ikiwiki/IkiWiki/Plugin/websetup.pm
\ No newline at end of file