From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 22 Aug 2008 02:25:53 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.62~84
X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=a98bfb05c066fcc0454b8904b881a22f879ab2b6

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

a98bfb05c066fcc0454b8904b881a22f879ab2b6