From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 9 Jun 2009 01:41:42 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.141~16
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/62ee542b1d9ea7a8cb57f42b3255c6a500664262

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

62ee542b1d9ea7a8cb57f42b3255c6a500664262