From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 19 Sep 2008 17:12:38 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.65~62
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/343117daf26da5c7d8851901211fc60b03781575?ds=inline;hp=--cc

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

343117daf26da5c7d8851901211fc60b03781575