From: Joey Hess <joey@kodama.kitenet.net>
Date: Sun, 29 Jun 2008 18:09:52 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.51~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=92b04db8833e812786d93a8dad8b9cb3741e5ed6;p=ikiwiki.git

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

92b04db8833e812786d93a8dad8b9cb3741e5ed6