From: Joey Hess <joey@kodama.kitenet.net>
Date: Sat, 14 Jun 2008 15:39:34 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.51~91
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=878e74238e7f9f243e3b0222e2915a148ac8bef1;p=ikiwiki.git

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

878e74238e7f9f243e3b0222e2915a148ac8bef1