From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 4 Sep 2008 19:50:23 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.63~18
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2fe3dfc9f93ffa3bedaba261cd37deb9539fa9f0;p=ikiwiki.git

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

2fe3dfc9f93ffa3bedaba261cd37deb9539fa9f0