From: Joey Hess <joey@kitenet.net>
Date: Tue, 6 Jul 2010 17:57:28 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100722~74
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7639474244083ec934edc801eb57010162eccf5e;p=ikiwiki.git

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

7639474244083ec934edc801eb57010162eccf5e