From: Joey Hess <joey@kodama.kitenet.net>
Date: Sat, 8 Nov 2008 17:35:28 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.69~25
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d552b2843020283b019729caf588f2e60b3a5396;p=ikiwiki.git

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

d552b2843020283b019729caf588f2e60b3a5396