From: Joey Hess <joeyh@joeyh.name>
Date: Sat, 14 Mar 2015 19:57:53 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: debian/3.20150329~32
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/cfd750aad091e4f82593f63164f9de3bb711479f?hp=cfd750aad091e4f82593f63164f9de3bb711479f

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