From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 5 Jun 2009 20:58:37 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.141~33
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/1e081cf7e404fc403d063d39614e8c9a6583f17f?hp=--cc

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

1e081cf7e404fc403d063d39614e8c9a6583f17f