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

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

2217e3d5bbb377bb40a5701e90341f011c49a536