From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 16 Oct 2009 16:18:20 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20091017~11
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7e987bbfeeea0d93a7d636de5124ecf15ef730be;p=ikiwiki.git

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

7e987bbfeeea0d93a7d636de5124ecf15ef730be