From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 13 Nov 2009 22:30:59 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20091113~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ce4fa7768cce4b5a18c7154a81bd9fe184b5b29d;p=ikiwiki.git

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

ce4fa7768cce4b5a18c7154a81bd9fe184b5b29d