From: Joey Hess <joey@kitenet.net>
Date: Tue, 29 May 2012 17:43:37 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20120629~52
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/73136f100f627e5982e06a2841e8cd086c38ef7f

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

73136f100f627e5982e06a2841e8cd086c38ef7f