From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 22 May 2009 17:09:38 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.13~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b23b7a8d6112aa7519a388ca49a7864d1e86df21;p=ikiwiki.git

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

b23b7a8d6112aa7519a388ca49a7864d1e86df21