From: Joey Hess <joey@kitenet.net>
Date: Wed, 19 Dec 2007 22:32:18 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
X-Git-Tag: 2.17~38
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/e9a40c8716afd6076c630a140186ee7b2ec9cfb4

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

e9a40c8716afd6076c630a140186ee7b2ec9cfb4