From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 10 Jun 2009 17:59:31 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.141~11
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/04aff6702b1e00ad968df6b90f3eca4eca02371c

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

04aff6702b1e00ad968df6b90f3eca4eca02371c