From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 2 Jan 2008 00:10:21 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
X-Git-Tag: 2.18~23
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/93a3707e9bedfa0f5f89e2b4419a10f7c8956691?ds=inline

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

93a3707e9bedfa0f5f89e2b4419a10f7c8956691