From: Joey Hess <joey@kitenet.net>
Date: Tue, 25 Feb 2014 04:14:50 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: debian/3.20140227~2
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/bc94b6a76ebd07d64bac78776b7d10d6e1265a28?hp=bc94b6a76ebd07d64bac78776b7d10d6e1265a28

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