From: Joey Hess <joey@kodama.kitenet.net>
Date: Sat, 13 Sep 2008 01:19:35 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.64~17
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f1e29d04a603351bd92780d1349d848b0eceba05;p=ikiwiki.git

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

f1e29d04a603351bd92780d1349d848b0eceba05