From: Joey Hess <joey@kodama.kitenet.net>
Date: Mon, 21 Jul 2008 13:59:50 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.54~1
X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=b386fd2185d2444b5dea4133646ec73e9867edb3

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

b386fd2185d2444b5dea4133646ec73e9867edb3