From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 17 Sep 2008 22:13:09 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.65~94
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=18d086dde871210c7cc9ca754b9ee3297306a676;p=ikiwiki.git

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

18d086dde871210c7cc9ca754b9ee3297306a676