From: Joey Hess <joey@kitenet.net>
Date: Tue, 3 Dec 2013 16:45:18 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: debian/3.20140102~34
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/854152c299da91cd9e1c27789c8c3fd57b8fb28e?ds=inline;hp=854152c299da91cd9e1c27789c8c3fd57b8fb28e

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