From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 16 Apr 2010 00:12:25 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100427~138
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4efc897fdfedeba55a55e82fd4b0145235281883;p=ikiwiki.git

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

4efc897fdfedeba55a55e82fd4b0145235281883