From: Joey Hess <joey@kitenet.net>
Date: Tue, 31 May 2011 20:24:13 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20110431~28
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/a24c0c543d4e4111dc206813889558bd5376fc8e?hp=a24c0c543d4e4111dc206813889558bd5376fc8e

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