From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 7 May 2008 18:12:14 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.46~35
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ed75653e4d1ebc9827601ab3649e1422f45ef338;p=ikiwiki.git

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

ed75653e4d1ebc9827601ab3649e1422f45ef338