From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 17 Sep 2008 19:57:42 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.65~96
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6a90f5cb3fca4e5530b144cf5bb054c15798756e;p=ikiwiki.git

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

6a90f5cb3fca4e5530b144cf5bb054c15798756e