From: Joey Hess <joeyh@joeyh.name>
Date: Fri, 2 Jan 2015 20:44:23 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20150107~5
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/2e2c3cd9e085aea93c379f37c4bfa4d740e954d2?hp=2e2c3cd9e085aea93c379f37c4bfa4d740e954d2

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