From: Joey Hess <joey@kitenet.net>
Date: Sat, 8 Nov 2014 04:09:34 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20150107~88
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/26d1cd6ad725183f0172e5d5c135fc1713a94a53

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

26d1cd6ad725183f0172e5d5c135fc1713a94a53