From: Joey Hess <joey@kitenet.net>
Date: Tue, 26 Mar 2013 02:10:39 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20130504~59
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/ab352678500156a9444a5815d65956af0aba7e4f

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

ab352678500156a9444a5815d65956af0aba7e4f