From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 29 Mar 2010 19:25:40 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100403~54
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4a09619a79487df3a343284d96b7228c86e36a60;p=ikiwiki.git

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

4a09619a79487df3a343284d96b7228c86e36a60