From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 30 Jan 2008 06:38:59 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
X-Git-Tag: 2.30~19
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ddfa16145ac4c9938606104b685b382e2acd2f05;p=ikiwiki.git

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

ddfa16145ac4c9938606104b685b382e2acd2f05