From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 12 Apr 2010 19:03:42 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100427~177
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5ce4c89dee82119a2f1147094eda82a735ea8098;p=ikiwiki.git

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

5ce4c89dee82119a2f1147094eda82a735ea8098