From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 5 May 2009 18:25:08 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.12~10
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=39717d0dbf66447a9f55b2bf27da413f37f4577c;p=ikiwiki.git

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

39717d0dbf66447a9f55b2bf27da413f37f4577c