From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 16 May 2009 20:42:47 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.13~83
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=52b7584701eee18f54bac250d55cbcf34e3b293b;p=ikiwiki.git

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

52b7584701eee18f54bac250d55cbcf34e3b293b