From: Joey Hess Date: Sat, 22 Dec 2007 18:36:24 +0000 (-0500) Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info X-Git-Tag: 2.17~21 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0e4da6b73b5c274b3fc832d5a602c6363efbcbad;p=ikiwiki.git Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info --- 0e4da6b73b5c274b3fc832d5a602c6363efbcbad