From: Joey Hess <joey@kodama.kitenet.net>
Date: Mon, 20 Oct 2008 23:19:03 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.68~128
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=99bf734963590005d457165665b0d8797c6a6221;p=ikiwiki.git

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

99bf734963590005d457165665b0d8797c6a6221