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

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

3bd1dd598d18e9237b85fc978540b998d8006212