From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 24 Jan 2008 22:25:07 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
X-Git-Tag: 2.30~119
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=285be77f17a6efb7633242a0febcadf511f61c10;p=ikiwiki.git

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

285be77f17a6efb7633242a0febcadf511f61c10