From: Joey Hess <joey@kitenet.net>
Date: Mon, 17 Feb 2014 16:24:54 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: debian/3.20140227~30
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/d81d20e52cf34c2238b452dd2f4a2f5bd1410467?ds=inline;hp=--cc

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

d81d20e52cf34c2238b452dd2f4a2f5bd1410467