From: Joey Hess <joey@kodama.kitenet.net>
Date: Sat, 27 Sep 2008 16:49:10 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.66~71
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c84c7d6ea7517a7c78c487d604f5a4db4693a446;p=ikiwiki.git

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

c84c7d6ea7517a7c78c487d604f5a4db4693a446