From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 6 Mar 2008 17:05:36 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
X-Git-Tag: 2.41~177
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0e7896690b8dbeb7c74fc0ce1f954159861fc8b3;p=ikiwiki.git

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

0e7896690b8dbeb7c74fc0ce1f954159861fc8b3