From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 24 Oct 2008 19:52:06 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.68~85
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/47367f7ba8f0ebe97832daf18d6db259e2151056?ds=inline;hp=--cc

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

47367f7ba8f0ebe97832daf18d6db259e2151056