From: Joey Hess <joey@kitenet.net>
Date: Thu, 6 Nov 2014 19:02:32 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20150107~94
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/0116509c81314c80bedc88185faa816d046c6ce5?ds=inline;hp=--cc

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

0116509c81314c80bedc88185faa816d046c6ce5