From: Joey Hess <joeyh@joeyh.name>
Date: Mon, 29 Dec 2014 19:50:41 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20150107~11
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/8a98440db6454fc8653c264f61502bd0d1d6baf8

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

8a98440db6454fc8653c264f61502bd0d1d6baf8