From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 25 Sep 2008 01:29:29 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.66~94
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9e55aa7f174810119cee77e47df5979c40490662;p=ikiwiki.git

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

9e55aa7f174810119cee77e47df5979c40490662