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

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

c4c31ea48f9118fd0ea29c40074a3e911c63b145