From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 10 Apr 2009 21:48:28 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.10~35
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6887d1af2af9926231d01a3b95b46a69241d1836;p=ikiwiki.git

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

6887d1af2af9926231d01a3b95b46a69241d1836