From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 27 Jul 2009 07:35:49 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.15~82
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/019329817761c2c594e97cf20258c48096f28116?hp=--cc

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

019329817761c2c594e97cf20258c48096f28116