From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 24 Oct 2008 17:30:29 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.68~96
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dfef51e10ed46419ce361411a0fd27966d84e21e;p=ikiwiki.git

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

dfef51e10ed46419ce361411a0fd27966d84e21e