From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 19 Jul 2009 12:54:38 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.15~168
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=06b54358ed532074cc9f5eef0d5e657031977b82;p=ikiwiki.git

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

06b54358ed532074cc9f5eef0d5e657031977b82