From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 10 Apr 2008 20:35:50 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.42~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=243739e1c355da4162dc1b41c04c11cc1fb676c0;p=ikiwiki.git

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

243739e1c355da4162dc1b41c04c11cc1fb676c0