From: Joey Hess <joey@kitenet.net>
Date: Wed, 26 Jun 2013 15:23:59 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20130710~26
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/d1adf36afa154458fd58815adee3cc4e32b03a32

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

d1adf36afa154458fd58815adee3cc4e32b03a32