From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 6 May 2009 17:07:06 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.12~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3c66e1552b70fe5ed5211aafcf127c647d79b481;p=ikiwiki.git

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

3c66e1552b70fe5ed5211aafcf127c647d79b481