From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 25 Sep 2008 18:40:50 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.66~92
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4c6d359b5fbe8f746965a2646a7bea03284b23cc;p=ikiwiki.git

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

4c6d359b5fbe8f746965a2646a7bea03284b23cc