From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 18 May 2009 19:49:15 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.13~48
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=300a4c548ccd2868d216f36d6180d93d86492148;p=ikiwiki.git

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

300a4c548ccd2868d216f36d6180d93d86492148