From: Joey Hess <joey@kitenet.net>
Date: Fri, 8 Nov 2013 18:33:05 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: debian/3.20140102~75
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/85c1479a299121781f5567940d4c983b77bab2ed?hp=85c1479a299121781f5567940d4c983b77bab2ed

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