From: Joey Hess <joey@kitenet.net>
Date: Mon, 17 Nov 2014 14:49:02 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20150107~80
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/3949e54c1a96aa33db44b9511f17ed4735d54ec7?hp=3949e54c1a96aa33db44b9511f17ed4735d54ec7

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