From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 14 Aug 1997 11:20:33 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.71~220
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9dead85cb6b92a7ca8e48b4ddd24b7ac4a48cdfa;p=ikiwiki.git

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

9dead85cb6b92a7ca8e48b4ddd24b7ac4a48cdfa