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

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

b74dceb884a60f6f7be395378a009ee414726d0b