From: Joey Hess <joey@kitenet.net>
Date: Mon, 10 Feb 2014 15:59:52 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: debian/3.20140227~31
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/00016e0006d1cc32769855cb60ea7cf279ed7ec0?ds=inline;hp=--cc

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

00016e0006d1cc32769855cb60ea7cf279ed7ec0