From: Joey Hess <joey@kitenet.net>
Date: Mon, 23 Sep 2013 17:21:56 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: debian/3.20140102~85
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/9ef8c8c47aec5f2218b42697760167b0eba6f8a3?hp=9ef8c8c47aec5f2218b42697760167b0eba6f8a3

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