From: Joey Hess <joey@kitenet.net>
Date: Wed, 30 Apr 2014 22:50:15 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: debian/3.20140613~55
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/4f63704be9ce8df65edb75be2e70f17dee70fe88?ds=inline;hp=--cc

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

4f63704be9ce8df65edb75be2e70f17dee70fe88