From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 2 Jan 2009 19:16:13 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.01~11
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=42c91cab61f3881dc758180ace5b7627809728ed;p=ikiwiki.git

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

42c91cab61f3881dc758180ace5b7627809728ed