From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 24 Aug 2009 18:05:11 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.1415926~79
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/05c1730064296712535ae553df8c3950fe487ae8

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

05c1730064296712535ae553df8c3950fe487ae8