From: Joey Hess <joey@kitenet.net>
Date: Tue, 26 Jul 2011 15:30:17 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=f8421938fbf0806eb95dafa58fc0ba97a9216301;hp=-c

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

f8421938fbf0806eb95dafa58fc0ba97a9216301