From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 28 Jan 2009 21:52:26 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.03~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1194584dad1a8326161658e5a5b1c7980d75023f;p=ikiwiki.git

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

1194584dad1a8326161658e5a5b1c7980d75023f