From: Joey Hess <joey@kodama.kitenet.net>
Date: Mon, 29 Sep 2008 17:26:52 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.66~50
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/71affd80d70c0e45c804e72915b23217539d0c26?ds=inline;hp=-c

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

71affd80d70c0e45c804e72915b23217539d0c26