From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 16 Nov 2007 17:53:34 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
X-Git-Tag: 2.13~27
X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=90baead73f1f6ad4e6a88df15069a480cd073fde

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

90baead73f1f6ad4e6a88df15069a480cd073fde