From: Joey Hess <joey@kitenet.net>
Date: Thu, 30 Aug 2012 16:03:32 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20121016~56
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/3661370af029a5391a1d7081ed70d83f5ad06c44?hp=-c

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

3661370af029a5391a1d7081ed70d83f5ad06c44