From: Joey Hess <joey@kitenet.net>
Date: Tue, 17 Sep 2013 18:11:19 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: debian/3.20140102~86
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/1e256b23b382a2ae95a4c7e2c18949bd69995e1a?hp=1e256b23b382a2ae95a4c7e2c18949bd69995e1a

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