From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 1 Sep 2009 17:04:52 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.14159265~85
X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=acd4adbbccb15598b4603498c023d2fa04c0979c

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

acd4adbbccb15598b4603498c023d2fa04c0979c