From: Joey Hess <joey@kodama.kitenet.net>
Date: Sun, 19 Oct 2008 23:55:28 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.68~163
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3bdc66d30045a7259a7a71173fc6ce85b17cfaf6;p=ikiwiki.git

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

3bdc66d30045a7259a7a71173fc6ce85b17cfaf6