From: Joey Hess <joey@kitenet.net>
Date: Fri, 20 Jul 2012 16:57:37 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20120725~63
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/7ec00df985f77eb7ebfe1640be67e1384fa98aa5?hp=25ea99bc223346607d91b6aa09b1b49bce220518

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

diff --git a/doc/users/adamshand.mdwn b/doc/users/adamshand.mdwn
index 5273c6439..9591cea2b 100644
--- a/doc/users/adamshand.mdwn
+++ b/doc/users/adamshand.mdwn
@@ -2,7 +2,7 @@
 
 New ikiwiki user (well not really "new" anymore), long time wiki user. :-)
 
-<http://adam.shand.net/iki/>
+<http://adam.shand.net/>
 
 [[!map pages="link(AdamShand)"]]