From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 8 Sep 2009 19:01:12 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.14159265~75^2~13
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/4bc65c1f45704cfdcdb45079ebe2b08ed0ae5cab?ds=inline;hp=--cc

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

4bc65c1f45704cfdcdb45079ebe2b08ed0ae5cab