From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 2 Dec 2009 22:23:14 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20091218~34
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4d9ef221eb446f87706f48d5df6c2f99ade16543;p=ikiwiki.git

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

4d9ef221eb446f87706f48d5df6c2f99ade16543