From: Joey Hess <joey@kodama.kitenet.net>
Date: Sun, 18 Nov 2007 22:24:01 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
X-Git-Tag: 2.13~11
X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=9f1e4994963d489fbc409555b4cfda33383cfe74

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

9f1e4994963d489fbc409555b4cfda33383cfe74