From: Joey Hess <joey@kodama.kitenet.net>
Date: Sat, 22 Mar 2008 17:57:01 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.41~20
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3b49868eb98e33204ca52ba944be4023f9f3f821;p=ikiwiki.git

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

3b49868eb98e33204ca52ba944be4023f9f3f821