From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 10 Apr 2010 22:29:20 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100427~183
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bb09a1f0010b749ac466f658b1a588bb2734bd84;p=ikiwiki.git

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

bb09a1f0010b749ac466f658b1a588bb2734bd84