From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 Dec 2007 06:10:10 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
X-Git-Tag: 2.16~88
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4f5916db5c95c2856a6d621d48116b85c2b7552e;p=ikiwiki.git

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

4f5916db5c95c2856a6d621d48116b85c2b7552e