From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 5 Feb 2009 17:48:42 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.04~64
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e911140243c010f9b05017fa38109da7e3200778;p=ikiwiki.git

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

e911140243c010f9b05017fa38109da7e3200778