From: Joey Hess <joey@kodama.kitenet.net>
Date: Sun, 21 Sep 2008 00:06:54 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.65~42
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c0d7c60b9f94b3f2927cd8484991e33190cd84cd;p=ikiwiki.git

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

c0d7c60b9f94b3f2927cd8484991e33190cd84cd