From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 21 May 2009 16:44:47 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.13~30
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/406a30ad0dd776e108c4088431a5cf8ae597c422

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

406a30ad0dd776e108c4088431a5cf8ae597c422