From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 25 Oct 2007 04:18:36 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
X-Git-Tag: 2.11~18
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0b0f50b484fc972bfa3752393fba66d6ca6a9edd;p=ikiwiki.git

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

0b0f50b484fc972bfa3752393fba66d6ca6a9edd