From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 8 Feb 2008 18:49:14 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
X-Git-Tag: 2.31~9
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8116a172308313be528ddefd4039c3971cf6fca2;p=ikiwiki.git

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

8116a172308313be528ddefd4039c3971cf6fca2