From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 12 Dec 2009 20:48:09 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/4b276377915198112856929c37d16697cbb7aaf3?hp=ff422a1d8903251da3768bd994753c2b04154ce9

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

diff --git a/doc/news/server_move_2009.mdwn b/doc/news/server_move_2009.mdwn
new file mode 100644
index 000000000..5865d2b7f
--- /dev/null
+++ b/doc/news/server_move_2009.mdwn
@@ -0,0 +1,6 @@
+[[!meta title="server move"]]
+
+The ikiwiki.info domain has been moved to a new server. If you can see
+this, though, your DNS has not caught up and you're using the old server
+still. Any changes made will be synced over to the new server, so don't
+worry. --[[Joey]]