From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 18 Dec 2008 23:00:03 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.71~57
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7fc83fbd15164691988d9a0f8043b2b727a20f7f;p=ikiwiki.git

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

7fc83fbd15164691988d9a0f8043b2b727a20f7f