From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 20 Jun 2008 23:41:24 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.51~64
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dab86121b22bb9092f4a5efcc1e70c521a083b37;p=ikiwiki.git

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

dab86121b22bb9092f4a5efcc1e70c521a083b37