From: Joey Hess <joey@kodama.kitenet.net>
Date: Sun, 6 Jul 2008 17:58:47 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.52~3^2~8
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=33e9442f4ae174ddf58b61b04190a26d5ac0ccce;p=ikiwiki.git

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

33e9442f4ae174ddf58b61b04190a26d5ac0ccce