From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 29 Oct 2008 17:37:45 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.68~45
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/3182cc6710ae85505aba9c670f434aad06d70e1c?ds=inline;hp=--cc

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

3182cc6710ae85505aba9c670f434aad06d70e1c